Split jvm and android runners

radixdlt · Feb 22, 2024 · 5c21619 · 5c21619
1 parent dc4716b
commit 5c21619
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 31 deletions.
diff --git a/.github/workflows/release-android.yml b/.github/workflows/release-android.yml
@@ -0,0 +1,62 @@
+name: CD Android
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - android
+
+permissions:
+  id-token: write
+  contents: write
+  packages: write
+env:
+  CARGO_TERM_COLOR: always
+jobs:
+  build:
+    runs-on: macos-13-xlarge
+    env:
+      RUST_TOOLCHAIN: nightly-2024-01-11
+      RUST_COMPONENTS: "rust-std"
+    steps:
+      - uses: RDXWorks-actions/checkout@main
+
+      - name: Install Rust Toolchain for aarch64-linux-android
+        uses: RDXWorks-actions/toolchain@master
+        with:
+          toolchain: ${{ env.RUST_TOOLCHAIN }}
+          components: ${{ env.RUST_COMPONENTS }}
+          target: aarch64-linux-android
+
+      - name: Install Rust Toolchain for armv7-linux-androideabi
+        uses: RDXWorks-actions/toolchain@master
+        with:
+          toolchain: ${{ env.RUST_TOOLCHAIN }}
+          components: ${{ env.RUST_COMPONENTS }}
+          target: armv7-linux-androideabi
+
+      - name: Set up JDK 17
+        uses: RDXWorks-actions/setup-java@v3
+        with:
+          distribution: 'adopt'
+          java-version: '17'
+
+      - name: Setup Android SDK
+        uses: RDXWorks-actions/setup-android@v2
+
+      - name: Install cargo-ndk
+        run: cargo install cargo-ndk
+
+      - name: Setup Env Variables
+        run: |
+          git fetch --prune --tags
+          echo "SARGON_VERSION=`git tag --sort=taggerdate | tail -1`-`git rev-parse --short @`" >> $GITHUB_ENV
+
+      - name: Build and publish Android
+        uses: RDXWorks-actions/gradle-build-action@main
+        with:
+          arguments: sargon-android:publish
+          build-root-directory: jvm
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
diff --git a/.github/workflows/release-jvm.yml b/.github/workflows/release-jvm.yml
@@ -21,23 +21,6 @@ jobs:
     steps:
       - uses: RDXWorks-actions/checkout@main
 
-      # Needed for Android
-      - name: Install Rust Toolchain for aarch64-linux-android
-        uses: RDXWorks-actions/toolchain@master
-        with:
-          toolchain: ${{ env.RUST_TOOLCHAIN }}
-          components: ${{ env.RUST_COMPONENTS }}
-          target: aarch64-linux-android
-
-      # Needed for Android
-      - name: Install Rust Toolchain for armv7-linux-androideabi
-        uses: RDXWorks-actions/toolchain@master
-        with:
-          toolchain: ${{ env.RUST_TOOLCHAIN }}
-          components: ${{ env.RUST_COMPONENTS }}
-          target: armv7-linux-androideabi
-
-      # Needed for unit tests running locally
       - name: Install Rust Toolchain for aarch64-apple-darwin
         uses: RDXWorks-actions/toolchain@master
         with:
@@ -50,26 +33,12 @@ jobs:
         with:
           distribution: 'adopt'
           java-version: '17'
-
-      - name: Setup Android SDK
-        uses: RDXWorks-actions/setup-android@v2
-
-      - name: Install cargo-ndk
-        run: cargo install cargo-ndk
 
       - name: Setup Env Variables
         run: |
           git fetch --prune --tags
           echo "SARGON_VERSION=`git tag --sort=taggerdate | tail -1`-`git rev-parse --short @`" >> $GITHUB_ENV
 
-      - name: Build and publish Android
-        uses: RDXWorks-actions/gradle-build-action@main
-        with:
-          arguments: sargon-android:publish
-          build-root-directory: jvm
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Build and publish Desktop binaries
         uses: RDXWorks-actions/gradle-build-action@main
         with: