BIT-2115: Try to fix mint caching again

bitwarden · Mar 20, 2024 · f03afc1 · f03afc1
1 parent fec2ae3
commit f03afc1
Showing 1 changed file with 17 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,6 +23,9 @@ jobs:
   build:
     name: Build iOS app
     runs-on: macos-13
+    env:
+      MINT_PATH: .mint/lib
+      MINT_LINK_PATH: .mint/bin
     steps:
       - name: Print Environment
         run: |
@@ -41,32 +44,37 @@ jobs:
           ruby-version: 3.2.2
 
       - name: Cache Mint Packages
+        id: mint-cache
         uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3
         with:
           path: .mint
-          key: ${{ runner.os }}-mint-${{ hashFiles('./Mintfile') }}
+          key: ${{ runner.os }}-mint-build-${{ hashFiles('**/Mintfile') }}
           restore-keys: |
-            ${{ runner.os }}-mint-
+            ${{ runner.os }}-mint-build-
 
       - name: Cache SPM Packages
         uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3
         with:
           path: build/DerivedData/SourcePackages
-          key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
+          key: ${{ runner.os }}-spm-build-${{ hashFiles('**/Package.resolved') }}
           restore-keys: |
-            ${{ runner.os }}-spm-
+            ${{ runner.os }}-spm-build-
 
       - name: Install yeetd
         run: |
           wget https://github.com/biscuitehh/yeetd/releases/download/1.0/yeetd-normal.pkg
           sudo installer -pkg yeetd-normal.pkg -target /
           yeetd &
 
-      - name: Install dependencies
+      - name: Install Mint
         run: |
-          brew install mint xcbeautify
-          ./Scripts/bootstrap.sh
+          brew install mint
 
-      - name: Build iOS app
+      - name: Install Mint packages
+        if: steps.mint-cache.outputs.cache-hit != 'true'
         run: |
-          ./Scripts/build.sh . 2024.1.1 100
+          ./Scripts/bootstrap.sh
+
+      # - name: Build iOS app
+      #   run: |
+      #     ./Scripts/build.sh . 2024.1.1 100