fix: Enable CI cache (#2438)

* fix: remove dev container * fix: return cache back * remove ruby cache * try previous version * fix update to previous one * fix use toolchain - 1.84.0 * fix components
novasamatech · Feb 25, 2025 · 963d698 · 963d698
1 parent 905506c
commit 963d698
Show file tree

Hide file tree

Showing 10 changed files with 119 additions and 133 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -39,13 +39,13 @@ jobs:
           brew install sourcery
           bundle install
 
-      # - name: Get cached Swift Packages managed by Xcode
-      #   uses: actions/cache@v3
-      #   with:
-      #     path: ~/Library/Developer/Xcode/DerivedData/**/SourcePackages/
-      #     key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-spm-
+      - name: Get cached Swift Packages managed by Xcode
+        uses: actions/cache@v3
+        with:
+          path: ~/Library/Developer/Xcode/DerivedData/**/SourcePackages/
+          key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
+          restore-keys: |
+            ${{ runner.os }}-spm-
 
       - name:                 Install Rust targets
         uses:                 dtolnay/rust-toolchain@stable
@@ -58,12 +58,12 @@ jobs:
         with:
           crate:              uniffi_bindgen
           version:            0.22.0 # Must be in sync with version in Cargo.toml
-          use-tool-cache:     false
+          use-tool-cache:     true
 
-      # - name:                 Rust Cache
-      #   uses:                 Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
-      #   with:
-      #     workspaces:         rust -> rust/target
+      - name:                 Rust Cache
+        uses:                 Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
+        with:
+          workspaces:         rust -> rust/target
 
       - name:                 Build iOS and run tests
         shell:                bash

diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml
@@ -38,28 +38,28 @@ jobs:
         with:
           crate:              uniffi_bindgen
           version:            0.22.0 # Must be in sync with version in Cargo.toml
-          use-tool-cache:     false
+          use-tool-cache:     true
 
       - name:           Install additional rust targets
         run:            rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android
 
       - name:           Install Android Dependencies
         uses:           ./.github/actions/install-android-dep
 
-      # - name:           Rust Cache
-      #   uses:           Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
-      #   with:
-      #     workspaces:   rust -> rust/target
-
-      # - name:           Gradle Cache
-      #   uses:           actions/cache@v3
-      #   with:
-      #     path:         |
-      #       ~/.gradle/caches
-      #       ~/.gradle/wrapper
-      #     key: ${{ runner.os }}-gradle-${{ hashFiles('**/.gradle*', '**/gradle-wrapper.properties') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-gradle-
+      - name:           Rust Cache
+        uses:           Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
+        with:
+          workspaces:   rust -> rust/target
+
+      - name:           Gradle Cache
+        uses:           actions/cache@v3
+        with:
+          path:         |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
 
       - name:           Build
         run:            |
@@ -92,28 +92,28 @@ jobs:
         with:
           crate:              uniffi_bindgen
           version:            0.22.0 # Must be in sync with version in Cargo.toml
-          use-tool-cache:     false
+          use-tool-cache:     true
 
       - name:           Install additional rust targets
         run:            rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android
 
       - name:           Install Android Dependencies
         uses:           ./.github/actions/install-android-dep
 
-      # - name:           Rust Cache
-      #   uses:           Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
-      #   with:
-      #     workspaces:   rust -> rust/target
-
-      # - name:           Gradle Cache
-      #   uses:           actions/cache@v3
-      #   with:
-      #     path:         |
-      #       ~/.gradle/caches
-      #       ~/.gradle/wrapper
-      #     key: ${{ runner.os }}-gradle-${{ hashFiles('**/.gradle*', '**/gradle-wrapper.properties') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-gradle-
+      - name:           Rust Cache
+        uses:           Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
+        with:
+          workspaces:   rust -> rust/target
+
+      - name:           Gradle Cache
+        uses:           actions/cache@v3
+        with:
+          path:         |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
 
       - name:           Assemble unsigned debug apk
         run:            |

diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml
@@ -34,28 +34,28 @@ jobs:
         with:
           crate:              uniffi_bindgen
           version:            0.22.0 # Must be in sync with version in Cargo.toml
-          use-tool-cache:     false
+          use-tool-cache:     true
 
       - name:           Install additional rust targets
         run:            rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android
 
       - name:           Install Android Dependencies
         uses:           ./.github/actions/install-android-dep
 
-      # - name:           Rust Cache
-      #   uses:           Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
-      #   with:
-      #     workspaces:   rust -> rust/target
-
-      # - name:           Gradle Cache
-      #   uses:           actions/cache@v3
-      #   with:
-      #     path:         |
-      #       ~/.gradle/caches
-      #       ~/.gradle/wrapper
-      #     key: ${{ runner.os }}-gradle-${{ hashFiles('**/.gradle*', '**/gradle-wrapper.properties') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-gradle-
+      - name:           Rust Cache
+        uses:           Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
+        with:
+          workspaces:   rust -> rust/target
+
+      - name:           Gradle Cache
+        uses:           actions/cache@v3
+        with:
+          path:         |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
 
       - name:           Build
         run:            |
@@ -88,28 +88,28 @@ jobs:
         with:
           crate:              uniffi_bindgen
           version:            0.22.0 # Must be in sync with version in Cargo.toml
-          use-tool-cache:     false
+          use-tool-cache:     true
 
       - name:           Install additional rust targets
         run:            rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android
 
       - name:           Install Android Dependencies
         uses:           ./.github/actions/install-android-dep
 
-      # - name:           Rust Cache
-      #   uses:           Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
-      #   with:
-      #     workspaces:   rust -> rust/target
-
-      # - name:           Gradle Cache
-      #   uses:           actions/cache@v3
-      #   with:
-      #     path:         |
-      #       ~/.gradle/caches
-      #       ~/.gradle/wrapper
-      #     key: ${{ runner.os }}-gradle-${{ hashFiles('**/.gradle*', '**/gradle-wrapper.properties') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-gradle-
+      - name:           Rust Cache
+        uses:           Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
+        with:
+          workspaces:   rust -> rust/target
+
+      - name:           Gradle Cache
+        uses:           actions/cache@v3
+        with:
+          path:         |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
 
       # Build and publish
 

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -33,10 +33,10 @@ jobs:
       - name:                 Install Rust stable toolchain
         uses:                 dtolnay/rust-toolchain@stable
 
-      # - name:                 Rust Cache
-      #   uses:                 Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
-      #   with:
-      #     workspaces:         rust -> rust/target
+      - name:                 Rust Cache
+        uses:                 Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
+        with:
+          workspaces:         rust -> rust/target
 
       - name:                 Install cargo-spellcheck
         uses:                 baptiste0928/cargo-install@1cd874a5478fdca35d868ccc74640c5aabbb8f1b # v3.0.0
@@ -48,7 +48,7 @@ jobs:
         with:
           crate:              uniffi_bindgen
           version:            0.22.0 # Must be in sync with version in Cargo.toml
-          use-tool-cache:     false
+          use-tool-cache:     true
 
       - name:                 Run spellcheck
         run:                  |

diff --git a/.github/workflows/rust-clippy.yml b/.github/workflows/rust-clippy.yml
@@ -15,7 +15,7 @@ jobs:
     name:                     Cargo clippy
     runs-on:                  ubuntu-22.04
     container:
-      image: ghcr.io/${{ github.repository }}/opencv-builder:4.11.0
+      image: ghcr.io/${{ github.repository }}/opencv-builder@sha256:c55a187a86eac41e1381d1f305eb1f139c80ba0082dea1cd9f9b55e43329d8f3
     steps:
 
       - name:                 Checkout sources
@@ -31,18 +31,21 @@ jobs:
 
       - name:                 Install Rust stable toolchain
         uses:                 dtolnay/rust-toolchain@stable
+        with:
+          toolchain:          1.84.0
+          components:         clippy
 
       - name:                 Install uniffi_bindgen
         uses:                 actions-rs/install@v0.1
         with:
           crate:              uniffi_bindgen
           version:            0.22.0 # Must be in sync with version in Cargo.toml
-          use-tool-cache:     false
+          use-tool-cache:     true
 
-      # - name:                 Rust Cache
-      #   uses:                 Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
-      #   with:
-      #     workspaces:         rust -> rust/target
+      - name:                 Rust Cache
+        uses:                 Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
+        with:
+          workspaces:         rust -> rust/target
 
       - name:                 cargo clippy
         run:                  |

diff --git a/.github/workflows/rust-test-android.yml b/.github/workflows/rust-test-android.yml
@@ -43,12 +43,12 @@ jobs:
         with:
           crate:              uniffi_bindgen
           version:            0.22.0 # Must be in sync with version in Cargo.toml
-          use-tool-cache:     false
+          use-tool-cache:     true
 
-      # - name:                 Rust Cache
-      #   uses:                 Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
-      #   with:
-      #     workspaces:         rust -> rust/target
+      - name:                 Rust Cache
+        uses:                 Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
+        with:
+          workspaces:         rust -> rust/target
 
       - name:                 cargo nextest
         run:                  |

diff --git a/.github/workflows/rust-test-ios.yml b/.github/workflows/rust-test-ios.yml
@@ -40,12 +40,12 @@ jobs:
         with:
           crate:              uniffi_bindgen
           version:            0.22.0 # Must be in sync with version in Cargo.toml
-          use-tool-cache:     false
+          use-tool-cache:     true
 
-      # - name:                 Rust Cache
-      #   uses:                 Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
-      #   with:
-      #     workspaces:         rust -> rust/target
+      - name:                 Rust Cache
+        uses:                 Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
+        with:
+          workspaces:         rust -> rust/target
 
       - name:                 cargo nextest
         shell:                bash

diff --git a/.github/workflows/testflight-prod.yml b/.github/workflows/testflight-prod.yml
@@ -34,13 +34,13 @@ jobs:
           brew install sourcery
           bundle install
 
-      # - name: Get cached Swift Packages managed by Xcode
-      #   uses: actions/cache@v3
-      #   with:
-      #     path: ~/Library/Developer/Xcode/DerivedData/**/SourcePackages/
-      #     key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-spm-
+      - name: Get cached Swift Packages managed by Xcode
+        uses: actions/cache@v3
+        with:
+          path: ~/Library/Developer/Xcode/DerivedData/**/SourcePackages/
+          key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
+          restore-keys: |
+            ${{ runner.os }}-spm-
 
       - name:                 Install Rust targets
         uses:                 dtolnay/rust-toolchain@stable
@@ -53,12 +53,12 @@ jobs:
         with:
           crate:              uniffi_bindgen
           version:            0.22.0 # Must be in sync with version in Cargo.toml
-          use-tool-cache:     false
+          use-tool-cache:     true
 
-      # - name:                 Rust Cache
-      #   uses:                 Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
-      #   with:
-      #     workspaces:         rust -> rust/target
+      - name:                 Rust Cache
+        uses:                 Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
+        with:
+          workspaces:         rust -> rust/target
 
       - name:                 Install the Apple certificate and provisioning profile
         env: