From de0fb2eba81d24469e839f9c122ba7949491cbd4 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sat, 6 Apr 2024 16:50:51 +0200 Subject: [PATCH 1/3] Update actions for new patch branch --- .github/workflows/syntax.yml | 2 ++ .github/workflows/test_linux.yml | 2 ++ .github/workflows/test_mac.yml | 4 +++- .github/workflows/test_win.yml | 4 +++- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/syntax.yml b/.github/workflows/syntax.yml index 43e1a3b7..1cb081f3 100644 --- a/.github/workflows/syntax.yml +++ b/.github/workflows/syntax.yml @@ -5,10 +5,12 @@ on: branches: - main - dev + - patch pull_request: branches: - main - dev + - patch jobs: checkSyntax: diff --git a/.github/workflows/test_linux.yml b/.github/workflows/test_linux.yml index acaf7566..f4ce1115 100644 --- a/.github/workflows/test_linux.yml +++ b/.github/workflows/test_linux.yml @@ -5,10 +5,12 @@ on: branches: - main - dev + - patch pull_request: branches: - main - dev + - patch jobs: testLinux: diff --git a/.github/workflows/test_mac.yml b/.github/workflows/test_mac.yml index 2c63d359..d5dc8f98 100644 --- a/.github/workflows/test_mac.yml +++ b/.github/workflows/test_mac.yml @@ -5,10 +5,12 @@ on: branches: - main - dev + - patch pull_request: branches: - main - dev + - patch jobs: testMac: @@ -17,7 +19,7 @@ jobs: - name: Python Setup uses: actions/setup-python@v5 with: - python-version: "3.11" + python-version: "3.12" architecture: x64 - name: Install Packages (brew) run: | diff --git a/.github/workflows/test_win.yml b/.github/workflows/test_win.yml index d9c30718..3198f308 100644 --- a/.github/workflows/test_win.yml +++ b/.github/workflows/test_win.yml @@ -5,10 +5,12 @@ on: branches: - main - dev + - patch pull_request: branches: - main - dev + - patch jobs: testWin: @@ -17,7 +19,7 @@ jobs: - name: Python Setup uses: actions/setup-python@v5 with: - python-version: "3.11" + python-version: "3.12" architecture: x64 - name: Checkout Source uses: actions/checkout@v4 From ba4a3c16f3ea2077fa49286ce87c171c6fa319fb Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sat, 6 Apr 2024 17:07:43 +0200 Subject: [PATCH 2/3] Change to release branches --- .github/workflows/syntax.yml | 6 ++---- .github/workflows/test_linux.yml | 6 ++---- .github/workflows/test_mac.yml | 6 ++---- .github/workflows/test_win.yml | 6 ++---- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/.github/workflows/syntax.yml b/.github/workflows/syntax.yml index 1cb081f3..1a8a3dd7 100644 --- a/.github/workflows/syntax.yml +++ b/.github/workflows/syntax.yml @@ -4,13 +4,11 @@ on: push: branches: - main - - dev - - patch + - releases/** pull_request: branches: - main - - dev - - patch + - releases/** jobs: checkSyntax: diff --git a/.github/workflows/test_linux.yml b/.github/workflows/test_linux.yml index f4ce1115..f15cc424 100644 --- a/.github/workflows/test_linux.yml +++ b/.github/workflows/test_linux.yml @@ -4,13 +4,11 @@ on: push: branches: - main - - dev - - patch + - releases/** pull_request: branches: - main - - dev - - patch + - releases/** jobs: testLinux: diff --git a/.github/workflows/test_mac.yml b/.github/workflows/test_mac.yml index d5dc8f98..eb176743 100644 --- a/.github/workflows/test_mac.yml +++ b/.github/workflows/test_mac.yml @@ -4,13 +4,11 @@ on: push: branches: - main - - dev - - patch + - releases/** pull_request: branches: - main - - dev - - patch + - releases/** jobs: testMac: diff --git a/.github/workflows/test_win.yml b/.github/workflows/test_win.yml index 3198f308..09d935ea 100644 --- a/.github/workflows/test_win.yml +++ b/.github/workflows/test_win.yml @@ -4,13 +4,11 @@ on: push: branches: - main - - dev - - patch + - releases/** pull_request: branches: - main - - dev - - patch + - releases/** jobs: testWin: From 12318b5c31aa65e7351a1e968308b668156af5e7 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sat, 6 Apr 2024 17:15:20 +0200 Subject: [PATCH 3/3] Keep windows and mac on Python 3.11 --- .github/workflows/test_mac.yml | 2 +- .github/workflows/test_win.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_mac.yml b/.github/workflows/test_mac.yml index eb176743..f4621123 100644 --- a/.github/workflows/test_mac.yml +++ b/.github/workflows/test_mac.yml @@ -17,7 +17,7 @@ jobs: - name: Python Setup uses: actions/setup-python@v5 with: - python-version: "3.12" + python-version: "3.11" architecture: x64 - name: Install Packages (brew) run: | diff --git a/.github/workflows/test_win.yml b/.github/workflows/test_win.yml index 09d935ea..c03700bc 100644 --- a/.github/workflows/test_win.yml +++ b/.github/workflows/test_win.yml @@ -17,7 +17,7 @@ jobs: - name: Python Setup uses: actions/setup-python@v5 with: - python-version: "3.12" + python-version: "3.11" architecture: x64 - name: Checkout Source uses: actions/checkout@v4