WIP - second attempt, now also doing release, not restoring rust cache, full build-quick matrix...

Author: mikehardy

.github/workflows/build-quick.yml

@@ -36,7 +36,7 @@ jobs:
           script: |
             // by default, we will include all 3 platforms we test on
             // "latest" would be easy everywhere, but "macos-15" isn't "latest" so we are specific there
-            let osArray = ["macos-tartelet-26"]
+            let osArray = ["ubuntu-latest", "windows-latest", "macos-tartelet-26"]
 
             let includeArray = [];
             for(const os of osArray) {
@@ -164,7 +164,7 @@ jobs:
 
       - name: Restore Rust Cache (Unix)
         uses: actions/cache/restore@v4
-        if: contains(matrix.os, 'windows') == false
+        if: contains(matrix.os, 'windows') == false && contains(matrix.os, 'tartelet') == false
         with:
           path: |
             ~/.cargo/registry

.github/workflows/build-release.yml

@@ -32,14 +32,21 @@ concurrency:
 
 jobs:
   build:
-    runs-on: macos-15
+    runs-on: macos-tartelet-26
     timeout-minutes: 180
     steps:
       - uses: actions/checkout@v5
 
       - name: Fetch submodules
         run: git submodule update --init
 
+      - name: Install macos self-hosted pre-requisites
+        # All platforms require cargo to build correctly, but our self-hosted tartelet
+        # image doesn't have cargo (or rustup) installed by default. Easily fixed
+        # TODO: get the rust toolchain version dynamically from anki/rust-toolchain.toml
+        run: |
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.89.0
+
       - name: Read configured NDK version
         run: |
           cargo install toml-cli
@@ -70,19 +77,20 @@ jobs:
           brew install MaterializeInc/crosstools/x86_64-unknown-linux-gnu
           x86_64-unknown-linux-gnu-gcc -v
 
-      - name: Restore Rust Cache
-        uses: actions/cache/restore@v4
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-            anki/out/rust
-            anki/out/extracted
-            anki/out/node_modules
-          key: ${{ runner.os }}-rust-release-${{ hashFiles('Cargo.lock') }}-${{ hashFiles('anki/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-rust-release
+#      - name: Restore Rust Cache
+#        uses: actions/cache/restore@v4
+#        if: contains(runner.os, 'tartelet') == false
+#        with:
+#          path: |
+#            ~/.cargo/registry
+#            ~/.cargo/git
+#            target
+#            anki/out/rust
+#            anki/out/extracted
+#            anki/out/node_modules
+#          key: ${{ runner.os }}-rust-release-${{ hashFiles('Cargo.lock') }}-${{ hashFiles('anki/yarn.lock') }}
+#          restore-keys: |
+#            ${{ runner.os }}-rust-release
 
       - name: Setup N2
         run: ./anki/tools/install-n2
@@ -148,15 +156,15 @@ jobs:
           export NO_CROSS=true
           ./gradlew rsdroid-testing:publishAllPublicationsToMavenCentral -Dorg.gradle.project.macCC=$ANKIDROID_MACOS_CC -DtestBuildType=debug -Dorg.gradle.daemon=false -Dorg.gradle.console=plain
 
-      - name: Save Rust Cache
-        uses: actions/cache/save@v4
-        if: github.ref == 'refs/heads/main'
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-            anki/out/rust
-            anki/out/download
-            anki/out/node_modules
-          key: ${{ runner.os }}-rust-release-${{ hashFiles('Cargo.lock') }}-${{ hashFiles('anki/yarn.lock') }}
+#      - name: Save Rust Cache
+#        uses: actions/cache/save@v4
+#        if: github.ref == 'refs/heads/main'
+#        with:
+#          path: |
+#            ~/.cargo/registry
+#            ~/.cargo/git
+#            target
+#            anki/out/rust
+#            anki/out/download
+#            anki/out/node_modules
+#          key: ${{ runner.os }}-rust-release-${{ hashFiles('Cargo.lock') }}-${{ hashFiles('anki/yarn.lock') }}