diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 526f2fa..0c59524 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,18 +1,20 @@ -name: Cross-Platform Release +name: Cross-Platform Release (TESTING) permissions: contents: write on: push: - tags: - - "v*" + branches: + - "ci/9-test-android-ndk-linking" + workflow_dispatch: jobs: publish: name: Build for ${{ matrix.asset_name }} runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: include: - os: ubuntu-latest @@ -59,12 +61,12 @@ jobs: target: aarch64-linux-android binary_name: rstf asset_name: rstf-android-arm64 - use_cross: false + use_cross: true - os: ubuntu-latest target: x86_64-linux-android binary_name: rstf asset_name: rstf-android-amd64 - use_cross: false + use_cross: true steps: - name: Checkout code @@ -84,16 +86,6 @@ jobs: if: contains(matrix.target, 'musl') run: sudo apt-get update && sudo apt-get install -y musl-tools - - name: Install Android NDK - if: contains(matrix.target, 'android') - uses: android-actions/setup-android@v3 - with: - packages: 'ndk;25.2.9519653' - - - name: Install cargo-ndk - if: contains(matrix.target, 'android') - run: cargo install cargo-ndk - - name: Setup Cross if: matrix.use_cross run: | @@ -104,15 +96,8 @@ jobs: - name: Build shell: bash run: | - TARGET="${{ matrix.target }}" - if [[ "$TARGET" == *"android"* ]]; then - export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/25.2.9519653 - - cargo ndk -t $TARGET -p 24 build --release - else - BUILD_CMD=${{ matrix.use_cross && 'cross' || 'cargo' }} - $BUILD_CMD build --release --target $TARGET - fi + BUILD_CMD=${{ matrix.use_cross && 'cross' || 'cargo' }} + $BUILD_CMD build --release --target ${{ matrix.target }} - name: Post-process binary shell: bash @@ -123,8 +108,9 @@ jobs: fi mv "$BIN_PATH" "${{ matrix.asset_name }}" - - name: Release - uses: softprops/action-gh-release@v2 + - name: Upload Artifact + uses: actions/upload-artifact@v4 with: - files: ${{ matrix.asset_name }} - fail_on_unmatched_files: true + name: binary-${{ matrix.asset_name }} + path: ${{ matrix.asset_name }} + retention-days: 1