perf(ci): NDK install uses rust, restore rust cache prior

Author: mikehardy

.github/workflows/build-quick.yml

@@ -140,37 +140,6 @@ jobs:
       - name: Fetch submodules
         run: git submodule update --init
 
-      - name: Read configured NDK version
-        run: |
-          cargo install toml-cli
-          ANDROID_NDK_VERSION=$(toml get gradle/libs.versions.toml versions.ndk --raw)
-          echo "ANDROID_NDK_VERSION=$ANDROID_NDK_VERSION" >> $GITHUB_ENV
-        shell: bash
-
-      - name: Install/Set NDK version (Unix)
-        if: contains(matrix.os, 'ubuntu') || contains(matrix.os, 'macos')
-        run: |
-          export PATH="$PATH:$ANDROID_HOME/cmdline-tools/latest/bin"
-          ./.github/scripts/install_ndk.sh ${ANDROID_NDK_VERSION}
-          export ANDROID_NDK_LATEST_HOME="${ANDROID_SDK_ROOT}/ndk/${ANDROID_NDK_VERSION}"
-          echo "ANDROID_NDK_HOME=$ANDROID_NDK_LATEST_HOME" >> $GITHUB_ENV
-          echo "ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME" >> $GITHUB_ENV
-
-      - name: Install/Set NDK version (Windows)
-        if: contains(matrix.os, 'windows')
-        run: |
-          $env:PATH = "$env:PATH;$env:ANDROID_HOME\cmdline-tools\latest\bin"
-          ./.github/scripts/install_ndk.bat $env:ANDROID_NDK_VERSION
-          $env:ANDROID_NDK_LATEST_HOME = "$env:ANDROID_SDK_ROOT\ndk\$env:ANDROID_NDK_VERSION"
-          Add-Content -Path $env:GITHUB_ENV -Value ANDROID_NDK_HOME=$env:ANDROID_NDK_LATEST_HOME
-          Add-Content -Path $env:GITHUB_ENV -Value ANDROID_NDK_ROOT=$env:ANDROID_NDK_LATEST_HOME
-
-      - name: Configure JDK
-        uses: actions/setup-java@v5
-        with:
-          distribution: "temurin"
-          java-version: "21" # matches Anki-Android
-
       - name: Restore Rust Cache (Windows)
         id: rust-cache-windows
         uses: actions/cache/restore@v4
@@ -207,6 +176,37 @@ jobs:
             ${{ runner.os }}-rust-debug
             ${{ runner.os }}-rust
 
+      - name: Read configured NDK version
+        run: |
+          cargo install toml-cli
+          ANDROID_NDK_VERSION=$(toml get gradle/libs.versions.toml versions.ndk --raw)
+          echo "ANDROID_NDK_VERSION=$ANDROID_NDK_VERSION" >> $GITHUB_ENV
+        shell: bash
+
+      - name: Install/Set NDK version (Unix)
+        if: contains(matrix.os, 'ubuntu') || contains(matrix.os, 'macos')
+        run: |
+          export PATH="$PATH:$ANDROID_HOME/cmdline-tools/latest/bin"
+          ./.github/scripts/install_ndk.sh ${ANDROID_NDK_VERSION}
+          export ANDROID_NDK_LATEST_HOME="${ANDROID_SDK_ROOT}/ndk/${ANDROID_NDK_VERSION}"
+          echo "ANDROID_NDK_HOME=$ANDROID_NDK_LATEST_HOME" >> $GITHUB_ENV
+          echo "ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME" >> $GITHUB_ENV
+
+      - name: Install/Set NDK version (Windows)
+        if: contains(matrix.os, 'windows')
+        run: |
+          $env:PATH = "$env:PATH;$env:ANDROID_HOME\cmdline-tools\latest\bin"
+          ./.github/scripts/install_ndk.bat $env:ANDROID_NDK_VERSION
+          $env:ANDROID_NDK_LATEST_HOME = "$env:ANDROID_SDK_ROOT\ndk\$env:ANDROID_NDK_VERSION"
+          Add-Content -Path $env:GITHUB_ENV -Value ANDROID_NDK_HOME=$env:ANDROID_NDK_LATEST_HOME
+          Add-Content -Path $env:GITHUB_ENV -Value ANDROID_NDK_ROOT=$env:ANDROID_NDK_LATEST_HOME
+
+      - name: Configure JDK
+        uses: actions/setup-java@v5
+        with:
+          distribution: "temurin"
+          java-version: "21" # matches Anki-Android
+
       - name: Setup N2
         run: bash ./anki/tools/install-n2
 

.github/workflows/build-release.yml

@@ -63,6 +63,23 @@ jobs:
         run: |
           curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none
 
+      - name: Restore Rust Cache
+        id: rust-cache
+        uses: actions/cache/restore@v4
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+            anki/out/rust
+            anki/out/download
+            anki/out/extracted
+            anki/out/node_modules
+          key: ${{ runner.os }}-rust-release-${{ hashFiles('Cargo.lock', 'anki/Cargo.lock', 'anki/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-rust-release
+            ${{ runner.os }}-rust
+
       - name: Read configured NDK version
         run: |
           cargo install toml-cli
@@ -95,23 +112,6 @@ jobs:
           brew install MaterializeInc/crosstools/x86_64-unknown-linux-gnu
           x86_64-unknown-linux-gnu-gcc -v
 
-      - name: Restore Rust Cache
-        id: rust-cache
-        uses: actions/cache/restore@v4
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-            anki/out/rust
-            anki/out/download
-            anki/out/extracted
-            anki/out/node_modules
-          key: ${{ runner.os }}-rust-release-${{ hashFiles('Cargo.lock', 'anki/Cargo.lock', 'anki/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-rust-release
-            ${{ runner.os }}-rust
-
       - name: Setup N2
         run: ./anki/tools/install-n2