Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into release_1.1

Browse Source
This commit is contained in:
Veronica K. B. Olsen
2021-02-07 19:43:39 +01:00
parent 70ab4122a3 66090e3926
commit 8aa376de25
8 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/syntax.yml
+2 -2
View File
@@ -2,9 +2,9 @@ name: flake8
on: on:
push: push:
branches: [ main, dev, release ] branches: [ main, testing, dev ]
pull_request: pull_request:
branches: [ main, dev, release ] branches: [ main, testing, dev ]
jobs: jobs:
checkSyntax: checkSyntax:
.github/workflows/test_linux_3.6.yml
+2 -2
View File
@@ -2,9 +2,9 @@ name: Linux (3.6)
on: on:
push: push:
branches: [ main, dev, release ] branches: [ main, testing, dev ]
pull_request: pull_request:
branches: [ main, dev, release ] branches: [ main, testing, dev ]
jobs: jobs:
testLinux36: testLinux36:
.github/workflows/test_linux_3.7.yml
+2 -2
View File
@@ -2,9 +2,9 @@ name: Linux (3.7)
on: on:
push: push:
branches: [ main, dev, release ] branches: [ main, testing, dev ]
pull_request: pull_request:
branches: [ main, dev, release ] branches: [ main, testing, dev ]
jobs: jobs:
testLinux37: testLinux37:
.github/workflows/test_linux_3.8.yml
+2 -2
View File
@@ -2,9 +2,9 @@ name: Linux (3.8)
on: on:
push: push:
branches: [ main, dev, release ] branches: [ main, testing, dev ]
pull_request: pull_request:
branches: [ main, dev, release ] branches: [ main, testing, dev ]
jobs: jobs:
testLinux38: testLinux38:
.github/workflows/test_linux_3.9.yml
+2 -2
View File
@@ -2,9 +2,9 @@ name: Linux (3.9)
on: on:
push: push:
branches: [ main, dev, release ] branches: [ main, testing, dev ]
pull_request: pull_request:
branches: [ main, dev, release ] branches: [ main, testing, dev ]
jobs: jobs:
testLinux39: testLinux39:
.github/workflows/test_mac.yml
+4 -4
View File
@@ -1,10 +1,10 @@
name: macOS (3.8) name: macOS (3.9)
on: on:
push: push:
branches: [ main, dev, release ] branches: [ main, testing, dev ]
pull_request: pull_request:
branches: [ main, dev, release ] branches: [ main, testing, dev ]
jobs: jobs:
testMac38: testMac38:
@@ -13,7 +13,7 @@ jobs:
- name: Python Setup - name: Python Setup
uses: actions/setup-python@v2 uses: actions/setup-python@v2
with: with:
python-version: 3.8 python-version: 3.9
architecture: x64 architecture: x64
- name: Install Packages - name: Install Packages
run: | run: |
.github/workflows/test_win.yml
+4 -4
View File
@@ -1,10 +1,10 @@
name: Windows (3.8) name: Windows (3.9)
on: on:
push: push:
branches: [ main, dev, release ] branches: [ main, testing, dev ]
pull_request: pull_request:
branches: [ main, dev, release ] branches: [ main, testing, dev ]
jobs: jobs:
testWin38: testWin38:
@@ -13,7 +13,7 @@ jobs:
- name: Python Setup - name: Python Setup
uses: actions/setup-python@v2 uses: actions/setup-python@v2
with: with:
python-version: 3.8 python-version: 3.9
architecture: x64 architecture: x64
- name: Checkout Source - name: Checkout Source
uses: actions/checkout@v2 uses: actions/checkout@v2
README.md
+2 -2
View File
@@ -4,8 +4,8 @@
[![Linux (3.7)](https://github.com/vkbo/novelWriter/workflows/Linux%20(3.7)/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions) [![Linux (3.7)](https://github.com/vkbo/novelWriter/workflows/Linux%20(3.7)/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions)
[![Linux (3.8)](https://github.com/vkbo/novelWriter/workflows/Linux%20(3.8)/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions) [![Linux (3.8)](https://github.com/vkbo/novelWriter/workflows/Linux%20(3.8)/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions)
[![Linux (3.9)](https://github.com/vkbo/novelWriter/workflows/Linux%20(3.9)/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions) [![Linux (3.9)](https://github.com/vkbo/novelWriter/workflows/Linux%20(3.9)/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions)
[![Windows (3.8)](https://github.com/vkbo/novelWriter/workflows/Windows%20(3.8)/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions) [![Windows (3.9)](https://github.com/vkbo/novelWriter/workflows/Windows%20(3.9)/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions)
[![macOS (3.8)](https://github.com/vkbo/novelWriter/workflows/macOS%20(3.8)/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions) [![macOS (3.9)](https://github.com/vkbo/novelWriter/workflows/macOS%20(3.9)/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions)
[![flake8](https://github.com/vkbo/novelWriter/workflows/flake8/badge.svg)](https://github.com/vkbo/novelWriter/actions) [![flake8](https://github.com/vkbo/novelWriter/workflows/flake8/badge.svg)](https://github.com/vkbo/novelWriter/actions)
[![codecov](https://codecov.io/gh/vkbo/novelWriter/branch/main/graph/badge.svg)](https://codecov.io/gh/vkbo/novelWriter) [![codecov](https://codecov.io/gh/vkbo/novelWriter/branch/main/graph/badge.svg)](https://codecov.io/gh/vkbo/novelWriter)
[![docs](https://readthedocs.org/projects/novelwriter/badge/?version=latest)](https://novelwriter.readthedocs.io/en/latest/?badge=latest) [![docs](https://readthedocs.org/projects/novelwriter/badge/?version=latest)](https://novelwriter.readthedocs.io/en/latest/?badge=latest)