Merge branch '2.1'

KDAB · Jul 4, 2024 · b70ef35 · b70ef35
2 parents f79aa8e + dbbd4b0
commit b70ef35
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -22,7 +22,6 @@ jobs:
           - windows-2019
           - macos-13
           - macos-12
-          - macos-11
 
         preset:
           - name: ci-release-static-qt5
@@ -78,7 +77,7 @@ jobs:
         #with:
           #ref: '2.0' # schedule.cron do not allow branch setting
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           cache: 'pip'
           cache-dependency-path: '.github/workflows/pip-requirements.txt'

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -14,5 +14,5 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-python@v3
+    - uses: actions/setup-python@v5
     - uses: pre-commit/[email protected]