Update python deps, add numpy (#59010)

* Update python deps, add numpy * Fix master build failures * One ccache per target branch
qgis · Oct 9, 2024 · 666983c · 666983c
1 parent 756083c
commit 666983c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/mingw64.yml b/.github/workflows/mingw64.yml
@@ -119,6 +119,7 @@ jobs:
 
       - name: Schedule download comment
         uses: ./.github/actions/post_sticky_comment
+        if: github.event_name == 'pull_request'
         with:
           marker: mingw64
           body: |

diff --git a/.github/workflows/windows-qt6.yml b/.github/workflows/windows-qt6.yml
@@ -50,6 +50,8 @@ jobs:
         uses: hendrikmuhs/ccache-action@v1.2
         with:
           max-size: 1G
+          key: build-ccache-win64-qt6-${{ github.event.pull_request.base.ref || github.ref_name }}
+          save: ${{ github.event_name == 'push' }}
 
       - name: 🌱 Install dependencies and generate project files
         shell: bash
@@ -128,6 +130,7 @@ jobs:
 
       - name: Schedule download comment
         uses: ./.github/actions/post_sticky_comment
+        if: github.event_name == 'pull_request'
         with:
           marker: mingw64-qt6
           body: |

diff --git a/vcpkg/vcpkg.json b/vcpkg/vcpkg.json
@@ -9,8 +9,8 @@
     "registries": [
       {
         "kind": "git",
-        "baseline": "6f244bbbd70800bc478cd19664f57fc96347fb3d",
-        "reference": "6f244bbbd70800bc478cd19664f57fc96347fb3d",
+        "baseline": "a1ff436b784f9b2b08ad14682237fab50a3e1932",
+        "reference": "a1ff436b784f9b2b08ad14682237fab50a3e1932",
         "repository": "https://github.com/open-vcpkg/python-registry",
         "packages": [
           "python3",
@@ -95,6 +95,7 @@
         "py-pip",
         "py-pyqt6",
         "py-qscintilla",
+        "py-numpy",
         "py-pyyaml",
         "py-psycopg2",
         "py-qgis-requirements",