ci: fix env export not working

netease-im · Jan 4, 2024 · d36369f · d36369f
1 parent 8a70a82
commit d36369f
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -66,10 +66,11 @@ jobs:
       - run: sudo dpkg --add-architecture arm64
       - run: sudo apt-get update
       - run: sudo apt-get install -y libssl-dev:arm64
-      - run: export OPENSSL_LIB_DIR=/usr/lib/aarch64-linux-gnu
-      - run: export OPENSSL_INCLUDE_DIR=/usr/include/aarch64-linux-gnu
       - 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
@@ -125,12 +126,14 @@ jobs:
       - run: curl -L https://github.com/217heidai/openssl_for_android/releases/download/3.2.0/OpenSSL_3.2.0_armeabi-v7a.tar.gz -o OpenSSL_3.2.0_armeabi-v7a.tar.gz
       - run: tar -xzf OpenSSL_3.2.0_arm64-v8a.tar.gz
       - run: tar -xzf OpenSSL_3.2.0_armeabi-v7a.tar.gz
-      - run: export OPENSSL_LIB_DIR=$PWD/OpenSSL_3.2.0_arm64-v8a/lib
-      - run: export OPENSSL_INCLUDE_DIR=$PWD/OpenSSL_3.2.0_arm64-v8a/include
       - run: cargo ndk -t arm64-v8a -o ./jniLibs build --release
-      - run: export OPENSSL_LIB_DIR=$PWD/OpenSSL_3.2.0_armeabi-v7a/lib
-      - run: export OPENSSL_INCLUDE_DIR=$PWD/OpenSSL_3.2.0_armeabi-v7a/include
+        env:
+          OPENSSL_LIB_DIR: $PWD/OpenSSL_3.2.0_arm64-v8a/lib
+          OPENSSL_INCLUDE_DIR: $PWD/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
       - uses: actions/upload-artifact@v4
         with:
           name: android-universal