Upload fs-storage on Windows instead

ARK-Builders · Nov 1, 2024 · 07842dd · 07842dd
1 parent 1c59c2d
commit 07842dd
Showing 1 changed file with 21 additions and 26 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,11 +17,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Set up required global dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install libssl-dev pkg-config
-
       - uses: actions/checkout@v4
 
       - name: Install Rust
@@ -60,34 +55,14 @@ jobs:
         run: gradle test
         working-directory: ./java
 
-      # Upload fs-storage JNI libs
-      - name: Install cargo-ndk
-        run: cargo install cargo-ndk
-
-      - name: Add Rust Toolchain
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          toolchain: stable
-          targets: aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android
-
-      - name: Build fs-storage JNI libs
-        run: cargo ndk -o ./target/release/fs-storage/jniLibs --target aarch64-linux-android --target armv7-linux-androideabi --target i686-linux-android --target x86_64-linux-android build -p fs-storage --release
-
-      - name: Upload fs-storage JNI libs
-        uses: actions/upload-artifact@v4
-        with:
-          name: fs-storage-jni-libs
-          path: ./target/release/fs-storage/jniLibs
-      # ---
-
       - name: Publish Java release
         run: gradle publish
         working-directory: ./java
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   windows:
-    name: Test on Windows
+    name: Build on Windows
     runs-on: windows-latest
 
     steps:
@@ -115,6 +90,26 @@ jobs:
         run: gradle test
         working-directory: ./java
 
+      # Upload fs-storage JNI libs
+      - name: Install cargo-ndk
+        run: cargo install cargo-ndk
+
+      - name: Add Rust Toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: stable
+          targets: aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android
+
+      - name: Build fs-storage JNI libs
+        run: cargo ndk -o ./target/release/fs-storage/jniLibs --target aarch64-linux-android --target armv7-linux-androideabi --target i686-linux-android --target x86_64-linux-android build -p fs-storage --release
+
+      - name: Upload fs-storage JNI libs
+        uses: actions/upload-artifact@v4
+        with:
+          name: fs-storage-jni-libs
+          path: ./target/release/fs-storage/jniLibs
+      # ---
+
   mac-intel:
     name: Test on macOS Intel
     runs-on: macos-14