Merge branch 'main' into fix-e2e-script

firebase · Sep 11, 2024 · e508591 · e508591
2 parents 9c7b216 + b8f3869
commit e508591
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 13 deletions.
diff --git a/.github/workflows/android.yaml b/.github/workflows/android.yaml
@@ -45,12 +45,14 @@ jobs:
         uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
         with:
           path: ~/.cache/firebase/emulators
-          key: firebase-emulators-v3-${{ github.run_id }}
+          key: firebase-emulators-v3-${{ runner.os }}
           restore-keys: firebase-emulators-v3
       - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1
         with:
           channel: 'stable'
           cache: true
+          cache-key: flutter-${{ runner.os }}
+          pub-cache-key: pub-${{ runner.os }}
       - uses: bluefireteam/melos-action@7e70fbe34bbd91a75eb505eeb4174b0ac9a1df52
         with:
           run-bootstrap: false
@@ -76,7 +78,7 @@ jobs:
           path: |
             ~/.android/avd/*
             ~/.android/adb*
-          key: avd-ubuntu
+          key: avd-${{ runner.os }}
       - name: Start AVD then run E2E tests
         uses: reactivecircus/android-emulator-runner@v2
         with:

diff --git a/.github/workflows/ios.yaml b/.github/workflows/ios.yaml
@@ -44,25 +44,27 @@ jobs:
       - uses: hendrikmuhs/ccache-action@c92f40bee50034e84c763e33b317c77adaa81c92
         name: Xcode Compile Cache
         with:
-          key: ${{ runner.os }}-ios-v3
+          key: xcode-cache-${{ runner.os }}
           max-size: 700M
       - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
         name: Pods Cache
         id: pods-cache
         with:
           path: tests/ios/Pods
-          key: ${{ runner.os }}-pods-v3-${{ hashFiles('tests/ios/Podfile.lock') }}
-          restore-keys: ${{ runner.os }}-ios-pods-v2
+          key: pods-v3-${{ runner.os }}-${{ hashFiles('tests/ios/Podfile.lock') }}
+          restore-keys: pods-v3-${{ runner.os }}
       - name: Firebase Emulator Cache
         uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
         with:
           path: ~/.cache/firebase/emulators
-          key: firebase-emulators-v3-${{ github.run_id }}
+          key: firebase-emulators-v3-${{ runner.os }}
           restore-keys: firebase-emulators-v3
       - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1
         with:
           channel: 'stable'
           cache: true
+          cache-key: flutter-${{ runner.os }}
+          pub-cache-key: pub-${{ runner.os }}
       - uses: bluefireteam/melos-action@7e70fbe34bbd91a75eb505eeb4174b0ac9a1df52
         with:
           run-bootstrap: false

diff --git a/.github/workflows/macos.yaml b/.github/workflows/macos.yaml
@@ -44,25 +44,27 @@ jobs:
       - uses: hendrikmuhs/ccache-action@c92f40bee50034e84c763e33b317c77adaa81c92
         name: Xcode Compile Cache
         with:
-          key: ${{ runner.os }}-macos-v2
+          key: xcode-cache-${{ runner.os }}
           max-size: 700M
       - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
         name: Pods Cache
         id: pods-cache
         with:
           path: tests/macos/Pods
-          key: ${{ runner.os }}-pods-v2-${{ hashFiles('tests/macos/Podfile.lock') }}
-          restore-keys: ${{ runner.os }}-macos-pods-v1
+          key: pods-v3-${{ runner.os }}-${{ hashFiles('tests/macos/Podfile.lock') }}
+          restore-keys: pods-v3-${{ runner.os }}
       - name: Cache Firebase Emulator
         uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
         with:
           path: ~/.cache/firebase/emulators
-          key: firebase-emulators-v3-${{ github.run_id }}
+          key: firebase-emulators-v3-${{ runner.os }}
           restore-keys: firebase-emulators-v3
       - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1
         with:
           channel: 'stable'
           cache: true
+          cache-key: flutter-${{ runner.os }}
+          pub-cache-key: pub-${{ runner.os }}
       - uses: bluefireteam/melos-action@7e70fbe34bbd91a75eb505eeb4174b0ac9a1df52
         with:
           run-bootstrap: false

diff --git a/.github/workflows/web.yaml b/.github/workflows/web.yaml
@@ -45,6 +45,8 @@ jobs:
         with:
           channel: 'stable'
           cache: true
+          cache-key: flutter-${{ runner.os }}
+          pub-cache-key: pub-${{ runner.os }}
       - uses: bluefireteam/melos-action@7e70fbe34bbd91a75eb505eeb4174b0ac9a1df52
         with:
           run-bootstrap: false
@@ -57,7 +59,7 @@ jobs:
         uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
         with:
           path: ~/.cache/firebase/emulators
-          key: firebase-emulators-v3-${{ github.run_id }}
+          key: firebase-emulators-v3-${{ runner.os }}
           restore-keys: firebase-emulators-v3
       - name: Start Firebase Emulator
         run: sudo chown -R 501:20 "/Users/runner/.npm" && cd ./.github/workflows/scripts && ./start-firebase-emulator.sh
@@ -95,6 +97,8 @@ jobs:
         with:
           channel: 'stable'
           cache: true
+          cache-key: flutter-${{ runner.os }}
+          pub-cache-key: pub-${{ runner.os }}
       - uses: bluefireteam/melos-action@7e70fbe34bbd91a75eb505eeb4174b0ac9a1df52
         with:
           run-bootstrap: false
@@ -107,7 +111,7 @@ jobs:
         uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
         with:
           path: ~/.cache/firebase/emulators
-          key: firebase-emulators-v3-${{ github.run_id }}
+          key: firebase-emulators-v3-${{ runner.os }}
           restore-keys: firebase-emulators-v3
       - name: Start Firebase Emulator
         run: sudo chown -R 501:20 "/Users/runner/.npm" && cd ./.github/workflows/scripts && ./start-firebase-emulator.sh
@@ -150,6 +154,8 @@ jobs:
         with:
           channel: 'stable'
           cache: true
+          cache-key: flutter-${{ runner.os }}
+          pub-cache-key: pub-${{ runner.os }}
       - uses: bluefireteam/melos-action@7e70fbe34bbd91a75eb505eeb4174b0ac9a1df52
         with:
           run-bootstrap: false
@@ -162,7 +168,7 @@ jobs:
         uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
         with:
           path: ~/.cache/firebase/emulators
-          key: firebase-emulators-v3-${{ github.run_id }}
+          key: firebase-emulators-v3-${{ runner.os }}
           restore-keys: firebase-emulators-v3
       - name: Start Firebase Emulator
         run: sudo chown -R 501:20 "/Users/runner/.npm" && cd ./.github/workflows/scripts && ./start-firebase-emulator.sh

diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
@@ -40,6 +40,8 @@ jobs:
         with:
           channel: 'stable'
           cache: true
+          cache-key: flutter-${{ runner.os }}
+          pub-cache-key: pub-${{ runner.os }}
       - uses: bluefireteam/melos-action@7e70fbe34bbd91a75eb505eeb4174b0ac9a1df52
         with:
           run-bootstrap: false
@@ -70,6 +72,8 @@ jobs:
         with:
           channel: 'stable'
           cache: true
+          cache-key: flutter-${{ runner.os }}
+          pub-cache-key: pub-${{ runner.os }}
       - uses: bluefireteam/melos-action@7e70fbe34bbd91a75eb505eeb4174b0ac9a1df52
         with:
           run-bootstrap: false