update ci script

OpenIoTHub · Aug 27, 2023 · 3b7f9ec · 3b7f9ec
1 parent c90e0a3
commit 3b7f9ec
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -37,11 +37,13 @@ jobs:
         with:
           ndk-version: r25c
       - name: Install requirement
-        run: apt-get update && apt-get install gcc-aarch64-linux-gnu -y
+        run: sudo apt-get update && sudo apt-get install gcc-aarch64-linux-gnu binutils-mingw-w64 -y
       - name: Test golang code
         run: go test ./...
       - name: Build linux libs
         run: ./lib/buildso.sh
+        env:
+          ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
       - name: Build windows libs
         run: ./lib/builddll.sh
 #      - uses: actions/upload-artifact@v2
@@ -61,7 +63,5 @@ jobs:
           go-version: ^1.20
       - name: Test golang code
         run: go test ./...
-      - name: Install requirement
-        run: go test ./...
       - name: Build libs
         run: ./lib/builddylib.sh
diff --git a/lib/buildso.sh b/lib/buildso.sh
@@ -17,7 +17,8 @@ export CC=aarch64-linux-gnu-gcc
 #export AR=aarch64-linux-gnu-ar
 go build -tags linux -ldflags=-w -trimpath -o build/linux/gateway_arm64.so -buildmode c-shared main.go
 
-export PATH=~/Android/Sdk/ndk/25.2.9519653/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
+tree $ANDROID_NDK_HOME
+export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:~/Android/Sdk/ndk/25.2.9519653/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
 #android/app/src/main/jniLibs/armeabi-v7a
 # shellcheck disable=SC2034
 export CGO_ENABLED=1