From 54881facf813b55c23be57e1a6d7cd16e81e8e13 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sat, 6 Feb 2021 14:07:08 +0100 Subject: [PATCH 1/2] Change release branch to testing, and bump mac and windows action to Python 3.9 --- .github/workflows/syntax.yml | 4 ++-- .github/workflows/test_linux_3.6.yml | 4 ++-- .github/workflows/test_linux_3.7.yml | 4 ++-- .github/workflows/test_linux_3.8.yml | 4 ++-- .github/workflows/test_linux_3.9.yml | 4 ++-- .github/workflows/test_mac.yml | 8 ++++---- .github/workflows/test_win.yml | 8 ++++---- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/syntax.yml b/.github/workflows/syntax.yml index 90a1246c..be794222 100644 --- a/.github/workflows/syntax.yml +++ b/.github/workflows/syntax.yml @@ -2,9 +2,9 @@ name: flake8 on: push: - branches: [ main, dev, release ] + branches: [ main, testing, dev ] pull_request: - branches: [ main, dev, release ] + branches: [ main, testing, dev ] jobs: checkSyntax: diff --git a/.github/workflows/test_linux_3.6.yml b/.github/workflows/test_linux_3.6.yml index 4f05a299..5f99496e 100644 --- a/.github/workflows/test_linux_3.6.yml +++ b/.github/workflows/test_linux_3.6.yml @@ -2,9 +2,9 @@ name: Linux (3.6) on: push: - branches: [ main, dev, release ] + branches: [ main, testing, dev ] pull_request: - branches: [ main, dev, release ] + branches: [ main, testing, dev ] jobs: testLinux36: diff --git a/.github/workflows/test_linux_3.7.yml b/.github/workflows/test_linux_3.7.yml index 857d11c0..f057beb6 100644 --- a/.github/workflows/test_linux_3.7.yml +++ b/.github/workflows/test_linux_3.7.yml @@ -2,9 +2,9 @@ name: Linux (3.7) on: push: - branches: [ main, dev, release ] + branches: [ main, testing, dev ] pull_request: - branches: [ main, dev, release ] + branches: [ main, testing, dev ] jobs: testLinux37: diff --git a/.github/workflows/test_linux_3.8.yml b/.github/workflows/test_linux_3.8.yml index ff78cc93..cb1bc8c4 100644 --- a/.github/workflows/test_linux_3.8.yml +++ b/.github/workflows/test_linux_3.8.yml @@ -2,9 +2,9 @@ name: Linux (3.8) on: push: - branches: [ main, dev, release ] + branches: [ main, testing, dev ] pull_request: - branches: [ main, dev, release ] + branches: [ main, testing, dev ] jobs: testLinux38: diff --git a/.github/workflows/test_linux_3.9.yml b/.github/workflows/test_linux_3.9.yml index 276bd91c..433596db 100644 --- a/.github/workflows/test_linux_3.9.yml +++ b/.github/workflows/test_linux_3.9.yml @@ -2,9 +2,9 @@ name: Linux (3.9) on: push: - branches: [ main, dev, release ] + branches: [ main, testing, dev ] pull_request: - branches: [ main, dev, release ] + branches: [ main, testing, dev ] jobs: testLinux39: diff --git a/.github/workflows/test_mac.yml b/.github/workflows/test_mac.yml index 72cb61a5..97955efb 100644 --- a/.github/workflows/test_mac.yml +++ b/.github/workflows/test_mac.yml @@ -1,10 +1,10 @@ -name: macOS (3.8) +name: macOS (3.9) on: push: - branches: [ main, dev, release ] + branches: [ main, testing, dev ] pull_request: - branches: [ main, dev, release ] + branches: [ main, testing, dev ] jobs: testMac38: @@ -13,7 +13,7 @@ jobs: - name: Python Setup uses: actions/setup-python@v2 with: - python-version: 3.8 + python-version: 3.9 architecture: x64 - name: Install Packages run: | diff --git a/.github/workflows/test_win.yml b/.github/workflows/test_win.yml index 2bf3390c..c8169f95 100644 --- a/.github/workflows/test_win.yml +++ b/.github/workflows/test_win.yml @@ -1,10 +1,10 @@ -name: Windows (3.8) +name: Windows (3.9) on: push: - branches: [ main, dev, release ] + branches: [ main, testing, dev ] pull_request: - branches: [ main, dev, release ] + branches: [ main, testing, dev ] jobs: testWin38: @@ -13,7 +13,7 @@ jobs: - name: Python Setup uses: actions/setup-python@v2 with: - python-version: 3.8 + python-version: 3.9 architecture: x64 - name: Checkout Source uses: actions/checkout@v2 From 60395fb16d4d271b14190ba5a588f390afd62956 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sat, 6 Feb 2021 14:14:47 +0100 Subject: [PATCH 2/2] Change badges in readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e6e563ef..488d39be 100644 --- a/README.md +++ b/README.md @@ -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.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) -[![Windows (3.8)](https://github.com/vkbo/novelWriter/workflows/Windows%20(3.8)/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) +[![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.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) [![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)