From e7b7a52821af79cbe76057e9e5191151b5b7a697 Mon Sep 17 00:00:00 2001 From: Silvio Tomatis Date: Sun, 8 Dec 2024 00:03:13 +0100 Subject: [PATCH] ci: Update Flatpak build cache key and simplify Windows GTK4 install script --- .github/workflows/build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 853d372..1d76452 100644 --- 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