From 30f0ff65b79902d31bcd47ef4a112f045c47df95 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Sun, 9 Jan 2022 22:20:36 +0000
Subject: CI: Build with latest PawPaw and LTO

Signed-off-by: falkTX <falktx@falktx.com>
---
 .github/workflows/build.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a33f255c..abab8912 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,9 +8,10 @@ on:
     branches:
       - '*'
 env:
+  CACHE_VERSION: 1
   DEBIAN_FRONTEND: noninteractive
   HOMEBREW_NO_AUTO_UPDATE: 1
-  PAWPAW_VERSION: 8c69660ab10b75cd7a488f41386dbcb4c8802c5a
+  PAWPAW_VERSION: f82379fcbf4623112ef497b118a96c1d94b7112e
 
 jobs:
   # macOS native intel build
@@ -25,7 +26,7 @@ jobs:
       with:
         path: |
           ~/PawPawBuilds
-        key: macos
+        key: macos-v${{ env.CACHE_VERSION }}
     - name: Set up dependencies
       run: |
         brew install cmake jq meson
@@ -68,7 +69,7 @@ jobs:
       with:
         path: |
           ~/PawPawBuilds
-        key: macos-universal
+        key: macos-universal-v${{ env.CACHE_VERSION }}
     - name: Set up dependencies
       run: |
         brew install cmake jq meson
@@ -115,7 +116,7 @@ jobs:
       with:
         path: |
           ~/PawPawBuilds
-        key: win32
+        key: win32-v${{ env.CACHE_VERSION }}
     - name: Restore debian packages cache
       run: |
         if [ -d ~/PawPawBuilds/debs ] && [ "$(ls ~/PawPawBuilds/debs | wc -l)" -ne 0 ]; then \
@@ -194,13 +195,13 @@ jobs:
       with:
         path: |
           ~/PawPawBuilds
-        key: win64
+        key: win64-v${{ env.CACHE_VERSION }}
     - name: Restore debian packages cache
       run: |
         if [ -d ~/PawPawBuilds/debs ] && [ "$(ls ~/PawPawBuilds/debs | wc -l)" -ne 0 ]; then \
           sudo cp ~/PawPawBuilds/debs/*.deb /var/cache/apt/archives/; \
         fi
-    - name: Fix GitHub mess
+    - name: Fix GitHub's mess
       run: |
         sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
         sudo apt-get update -qq
@@ -280,7 +281,7 @@ jobs:
       with:
         path: |
           ~/debs
-        key: ubuntu-20.04
+        key: ubuntu-20.04-v${{ env.CACHE_VERSION }}
     - name: Restore debian packages cache
       run: |
         if [ -d ~/debs ] && [ "$(ls ~/debs | wc -l)" -ne 0 ]; then \
-- 
cgit v1.2.1