ci: Update Flatpak build cache key and simplify Windows GTK4 install …

…script
p2panda · Dec 7, 2024 · e7b7a52 · e7b7a52
1 parent a1dd7c5
commit e7b7a52
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -35,7 +35,7 @@ jobs:
         with:
           bundle: aardvark.flatpak
           manifest-path: org.p2panda.aardvark.json
-          cache-key: flatpak-builder-${{ github.sha }}
+          cache-key: flatpak-builder-${{ hashFiles('org.p2panda.aardvark.json') }}-${{ matrix.arch }}
           arch: ${{ matrix.arch }}
 
   macos:
@@ -172,8 +172,7 @@ jobs:
             vcpkg-${{ matrix.arch }}-
 
       - name: Install GTK4 and dependencies
-        run: |
-          . .\.github\workflows\install_vcpkg.ps1
+        run: . .\.github\workflows\install_vcpkg.ps1
         shell: pwsh
 
       - name: Configure pkg-config paths