From 3f48d25719f443e905544ecfd19dd0fbb0137f4e Mon Sep 17 00:00:00 2001 From: Zvicii Date: Thu, 4 Jan 2024 15:43:06 +0800 Subject: [PATCH] ci: use ${{ github.workspace }} instead of $PWD --- .github/workflows/ci.yml | 33 ++++----------------------------- 1 file changed, 4 insertions(+), 29 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d84f7db..6fa0512 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,31 +54,6 @@ jobs: resources/ne_s3.h target/x86_64-unknown-linux-gnu/release/libne_s3.so target/x86_64-unknown-linux-gnu/release/ne-s3-client - aarch64-unknown-linux-gnu: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@stable - with: - toolchain: stable - targets: aarch64-unknown-linux-gnu - # install openssl for aarch64 - - run: sudo dpkg --add-architecture arm64 - - run: sudo apt-get update - - run: sudo apt-get install -y libssl-dev:arm64 - - run: cargo install cross - - run: cross build --release --target aarch64-unknown-linux-gnu - env: - OPENSSL_LIB_DIR: /usr/lib/aarch64-linux-gnu - OPENSSL_INCLUDE_DIR: /usr/include/aarch64-linux-gnu - - uses: actions/upload-artifact@v4 - with: - name: aarch64-unknown-linux-gnu - path: | - resources/cacert.pem - resources/ne_s3.h - target/aarch64-unknown-linux-gnu/release/libne_s3.so - target/aarch64-unknown-linux-gnu/release/ne-s3-client x86_64-apple-darwin: runs-on: macos-latest steps: @@ -128,12 +103,12 @@ jobs: - run: tar -xzf OpenSSL_3.2.0_armeabi-v7a.tar.gz - run: cargo ndk -t arm64-v8a -o ./jniLibs build --release env: - OPENSSL_LIB_DIR: $PWD/OpenSSL_3.2.0_arm64-v8a/lib - OPENSSL_INCLUDE_DIR: $PWD/OpenSSL_3.2.0_arm64-v8a/include + OPENSSL_LIB_DIR: ${{ github.workspace }}/OpenSSL_3.2.0_arm64-v8a/lib + OPENSSL_INCLUDE_DIR: ${{ github.workspace }}/OpenSSL_3.2.0_arm64-v8a/include - run: cargo ndk -t armeabi-v7a -o ./jniLibs build --release env: - OPENSSL_LIB_DIR: $PWD/OpenSSL_3.2.0_armeabi-v7a/lib - OPENSSL_INCLUDE_DIR: $PWD/OpenSSL_3.2.0_armeabi-v7a/include + OPENSSL_LIB_DIR: ${{ github.workspace }}/OpenSSL_3.2.0_armeabi-v7a/lib + OPENSSL_INCLUDE_DIR: ${{ github.workspace }}/OpenSSL_3.2.0_armeabi-v7a/include - uses: actions/upload-artifact@v4 with: name: android-universal