cd: add deps

nymtech · Apr 19, 2024 · 16af82c · 16af82c
1 parent 7157597
commit 16af82c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/.github/workflows/cd-pre-release.yml b/.github/workflows/cd-pre-release.yml
@@ -51,6 +51,11 @@ jobs:
       - name: Add cargo-ndk
         run: |
           cargo install cargo-ndk
+
+      - name: Install deps
+        run: |
+          sudo apt-get update && sudo apt-get install -y libdbus-1-dev libmnl-dev libnftnl-dev protobuf-compiler git curl gcc g++ make unzip
+
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
       # Here we need to decode keystore.jks from base64 string and place it

diff --git a/.github/workflows/cd-release.yml b/.github/workflows/cd-release.yml
@@ -53,6 +53,10 @@ jobs:
           cargo install cargo-ndk
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
+
+      - name: Install deps
+        run: |
+            sudo apt-get update && sudo apt-get install -y libdbus-1-dev libmnl-dev libnftnl-dev protobuf-compiler git curl gcc g++ make unzip
       # Here we need to decode keystore.jks from base64 string and place it
       # in the folder specified in the release signing configuration
       - name: Decode Keystore

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -46,9 +46,7 @@ android {
 					try {
 						load(file("signing.properties").reader())
 					} catch (_: Exception) {
-						// can't find signing file, use debug
-						this@create.initWith(signingConfigs.getByName("debug"))
-						return@create
+						load(file("signing_template.properties").reader())
 					}
 				}
 			// try to get secrets from env first for pipeline build, then properties file for local

diff --git a/nym_vpn_client/src/main/jniLibs/armeabi-v7a/libjnidispatch.so b/nym_vpn_client/src/main/jniLibs/armeabi-v7a/libjnidispatch.so
diff --git a/nym_vpn_client/src/main/scripts/build-libs.sh b/nym_vpn_client/src/main/scripts/build-libs.sh
@@ -28,10 +28,10 @@ sed -i 's/package nym-vpn-lib;/package nym_vpn_lib;/g' $PWD/src/main/java/net/ny
 
 mv $PWD/src/main/jniLibs/arm64-v8a/libnym_vpn_lib.so $PWD/src/main/jniLibs/arm64-v8a/libnym_vpn_lib.so
 mv $PWD/src/main/jniLibs/armeabi-v7a/libnym_vpn_lib.so $PWD/src/main/jniLibs/armeabi-v7a/libnym_vpn_lib.so
-mv $PWD/src/main/jniLibs/x86/libnym_vpn_lib.so $PWD/src/main/jniLibs/x86/libnym_vpn_lib.so
-mv $PWD/src/main/jniLibs/x86_64/libnym_vpn_lib.so $PWD/src/main/jniLibs/x86_64/libnym_vpn_lib.so
+#mv $PWD/src/main/jniLibs/x86/libnym_vpn_lib.so $PWD/src/main/jniLibs/x86/libnym_vpn_lib.so
+#mv $PWD/src/main/jniLibs/x86_64/libnym_vpn_lib.so $PWD/src/main/jniLibs/x86_64/libnym_vpn_lib.so
 
 mv $PWD/src/tools/nym-vpn-client/android/app/build/extraJni/arm64-v8a/libwg.so $PWD/src/main/jniLibs/arm64-v8a/
 mv $PWD/src/tools/nym-vpn-client/android/app/build/extraJni/armeabi-v7a/libwg.so $PWD/src/main/jniLibs/armeabi-v7a/
-mv $PWD/src/tools/nym-vpn-client/android/app/build/extraJni/x86/libwg.so $PWD/src/main/jniLibs/x86/
-mv $PWD/src/tools/nym-vpn-client/android/app/build/extraJni/x86_64/libwg.so $PWD/src/main/jniLibs/x86_64/
+#mv $PWD/src/tools/nym-vpn-client/android/app/build/extraJni/x86/libwg.so $PWD/src/main/jniLibs/x86/
+#mv $PWD/src/tools/nym-vpn-client/android/app/build/extraJni/x86_64/libwg.so $PWD/src/main/jniLibs/x86_64/