Skip to content

Commit

Permalink
ci: use ${{ github.workspace }} instead of $PWD
Browse files Browse the repository at this point in the history
  • Loading branch information
Zvicii committed Jan 4, 2024
1 parent d36369f commit 3f48d25
Showing 1 changed file with 4 additions and 29 deletions.
33 changes: 4 additions & 29 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 3f48d25

Please sign in to comment.