Optimize workflow triggers and block dependabot (#3651)

tommyv1987 · web-flow · commit ed865f763114 · 2025-10-09T11:31:28.000+02:00
* Optimize workflow triggers and block dependabot

- Add synchronize/reopened to PR triggers for continuous validation
- Use specific path triggers (crates/** instead of **)
- Preserve all caching (Cargo, Go, npm, gradle)
- Keep timeout-minutes for stability

* Fix clippy

* More clippy!

* Local clippy not catching these is frustrating..

* Remove obsolete lib_types rename in Android build

- lib_types is bundled into lib_uniffi

* Attempt another fix

* Build bindings for both
diff --git a/.github/workflows/ci-nym-vpn-android.yml b/.github/workflows/ci-nym-vpn-android.yml
@@ -2,7 +2,7 @@ name: ci-nym-vpn-android
 
 on:
   pull_request:
-    types: [opened]
+    types: [opened, synchronize, reopened]
     paths:
       - "nym-vpn-core/crates/**"
       - "nym-vpn-core/Cargo.toml"
diff --git a/.github/workflows/ci-nym-vpn-app-js.yml b/.github/workflows/ci-nym-vpn-app-js.yml
@@ -2,7 +2,7 @@ name: ci-nym-vpn-app-js
 
 on:
   pull_request:
-    types: [opened]
+    types: [opened, synchronize, reopened]
     paths:
       - ".github/workflows/ci-nym-vpn-app-js.yml"
       - "nym-vpn-app/**"
diff --git a/.github/workflows/ci-nym-vpn-app-rust.yml b/.github/workflows/ci-nym-vpn-app-rust.yml
@@ -2,7 +2,7 @@ name: ci-nym-vpn-app-rust
 
 on:
   pull_request:
-    types: [opened]
+    types: [opened, synchronize, reopened]
     paths:
       - ".github/workflows/ci-nym-vpn-app-rust.yml"
       - "nym-vpn-app/src-tauri/**"
diff --git a/.github/workflows/ci-nym-vpn-core-android.yml b/.github/workflows/ci-nym-vpn-core-android.yml
@@ -2,7 +2,7 @@ name: ci-nym-vpn-core-android
 
 on:
   pull_request:
-    types: [opened]
+    types: [opened, synchronize, reopened]
     paths:
       - "nym-vpn-core/crates/**"
       - "nym-vpn-core/Cargo.toml"
@@ -60,6 +60,27 @@ jobs:
           version: "21.12" # 3.21.12: the version on ubuntu 24.04. Don't change this!
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Cache Cargo registry
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('nym-vpn-core/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-cargo-
+
+      - name: Cache Cargo build
+        uses: actions/cache@v4
+        with:
+          path: nym-vpn-core/target/
+          key: ${{ runner.os }}-cargo-build-${{ hashFiles('nym-vpn-core/Cargo.lock') }}-${{ hashFiles('nym-vpn-core/**/*.rs') }}
+          restore-keys: |
+            ${{ runner.os }}-cargo-build-${{ hashFiles('nym-vpn-core/Cargo.lock') }}-
+            ${{ runner.os }}-cargo-build-
+
       - name: Download artifacts
         uses: actions/download-artifact@v5
         with:
diff --git a/.github/workflows/ci-nym-vpn-core-cargo-deny.yml b/.github/workflows/ci-nym-vpn-core-cargo-deny.yml
@@ -1,7 +1,7 @@
 name: ci-nym-vpn-core-cargo-deny
 on:
   pull_request:
-    types: [opened]
+    types: [opened, synchronize, reopened]
     paths:
       - "nym-vpn-core/**/Cargo.lock"
       - "nym-vpn-core/**/Cargo.toml"
diff --git a/.github/workflows/ci-nym-vpn-core-ios.yml b/.github/workflows/ci-nym-vpn-core-ios.yml
@@ -2,7 +2,7 @@ name: ci-nym-vpn-core-ios
 
 on:
   pull_request:
-    types: [opened]
+    types: [opened, synchronize, reopened]
     paths:
       - "nym-vpn-core/crates/**"
       - "nym-vpn-core/Cargo.toml"
diff --git a/.github/workflows/ci-nym-vpn-core-linux.yml b/.github/workflows/ci-nym-vpn-core-linux.yml
@@ -2,7 +2,7 @@ name: ci-nym-vpn-core-linux
 
 on:
   pull_request:
-    types: [opened]
+    types: [opened, synchronize, reopened]
     paths:
       - "nym-vpn-core/crates/**"
       - "nym-vpn-core/Cargo.toml"
@@ -41,6 +41,27 @@ jobs:
           version: "21.12" # 3.21.12: the version on ubuntu 24.04. Don't change this!
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Cache Cargo registry
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('nym-vpn-core/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-cargo-
+
+      - name: Cache Cargo build
+        uses: actions/cache@v4
+        with:
+          path: nym-vpn-core/target/
+          key: ${{ runner.os }}-cargo-build-${{ hashFiles('nym-vpn-core/Cargo.lock') }}-${{ hashFiles('nym-vpn-core/**/*.rs') }}
+          restore-keys: |
+            ${{ runner.os }}-cargo-build-${{ hashFiles('nym-vpn-core/Cargo.lock') }}-
+            ${{ runner.os }}-cargo-build-
+
       # To avoid running out of disk space, skip generating debug symbols
       - name: Set debug to false
         working-directory: nym-vpn-core
diff --git a/.github/workflows/ci-nym-vpn-core-macos.yml b/.github/workflows/ci-nym-vpn-core-macos.yml
@@ -2,7 +2,7 @@ name: ci-nym-vpn-core-macos
 
 on:
   pull_request:
-    types: [opened]
+    types: [opened, synchronize, reopened]
     paths:
       - "nym-vpn-core/crates/**"
       - "nym-vpn-core/Cargo.toml"
diff --git a/.github/workflows/ci-nym-vpn-core-windows.yml b/.github/workflows/ci-nym-vpn-core-windows.yml
@@ -2,7 +2,7 @@ name: ci-nym-vpn-core-windows
 
 on:
   pull_request:
-    types: [opened]
+    types: [opened, synchronize, reopened]
     paths:
       - "nym-vpn-core/crates/**"
       - "nym-vpn-core/Cargo.toml"
@@ -59,6 +59,27 @@ jobs:
           version: "21.12" # 3.21.12: the version on ubuntu 24.04. Don't change this!
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Cache Cargo registry
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('nym-vpn-core/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-cargo-
+
+      - name: Cache Cargo build
+        uses: actions/cache@v4
+        with:
+          path: nym-vpn-core/target/
+          key: ${{ runner.os }}-cargo-build-${{ hashFiles('nym-vpn-core/Cargo.lock') }}-${{ hashFiles('nym-vpn-core/**/*.rs') }}
+          restore-keys: |
+            ${{ runner.os }}-cargo-build-${{ hashFiles('nym-vpn-core/Cargo.lock') }}-
+            ${{ runner.os }}-cargo-build-
+
       - name: Install GNU make
         run: |
           winget list GnuWin32.Make || winget install --disable-interactivity --accept-source-agreements --id GnuWin32.Make
diff --git a/nym-vpn-app/src-tauri/src/grpc/account_error.rs b/nym-vpn-app/src-tauri/src/grpc/account_error.rs
@@ -17,7 +17,7 @@ impl From<VpnApiError> for BackendError {
             VpnApiErrorDetail::Timeout(_) => BackendError::internal("nym-vpn-api timeout", None),
             VpnApiErrorDetail::StatusCode(code) => BackendError::internal_with_detail(
                 "nym-vpn-api error",
-                format!("nym-vpn-api returned: {code}"),
+                format!("nym-vpn-api returned: {code:?}"),
             ),
             VpnApiErrorDetail::Response(response) => BackendError::from(response),
         }
diff --git a/nym-vpn-core/Android.mk b/nym-vpn-core/Android.mk
@@ -39,15 +39,17 @@ LIBWG_SOURCES := $(wildcard $(WIREGUARD_DIR)/libwg/*.go) $(wildcard $(WIREGUARD_
 all: $(ARM64_V8_BUILD_DIR)/libwg.so build uniffi $(LICENSES_FILE)
 
 build: $(ARM64_V8_BUILD_DIR)/libwg.so
-	$(ALL_IDEMPOTENT_FLAGS) cargo ndk -t arm64-v8a -o $(JNI_LIBS_DIR) build --package nym-vpn-lib-uniffi $(RELEASE_FLAG)
+	$(ALL_IDEMPOTENT_FLAGS) cargo ndk -t arm64-v8a -o $(JNI_LIBS_DIR) build --package nym-vpn-lib-uniffi --package nym-vpn-lib-types $(RELEASE_FLAG)
 	cd $(ARM64_V8_BUILD_DIR) ; \
-	mv libnym_vpn_lib_uniffi.so libnym_vpn_lib.so ; \
-	mv libnym_vpn_lib_types_uniffi.so libnym_vpn_lib_types.so
+	mv libnym_vpn_lib_uniffi.so libnym_vpn_lib.so
 
 uniffi: build
 	cargo run --bin uniffi-bindgen generate \
 		--library $(DYNAMIC_LIB_PATH) \
 		--language kotlin --out-dir $(UNIFFI_OUT_DIR) -n
+	cargo run --bin uniffi-bindgen generate \
+		--library $(ARM64_V8_BUILD_DIR)/libnym_vpn_lib_types.so \
+		--language kotlin --out-dir $(UNIFFI_OUT_DIR) -n
 
 $(ARM64_V8_BUILD_DIR)/libwg.so: $(LIBWG_SOURCES)
 	$(WIREGUARD_DIR)/build-wireguard-go.sh --android $(DOCKER_FLAG)
diff --git a/nym-vpn-core/crates/nym-vpn-lib-types/Cargo.toml b/nym-vpn-core/crates/nym-vpn-lib-types/Cargo.toml
@@ -8,6 +8,9 @@ documentation.workspace = true
 edition.workspace = true
 license.workspace = true
 
+[lib]
+crate-type = ["cdylib", "lib"]
+
 [lints]
 workspace = true
 
diff --git a/nym-vpn-core/crates/nym-vpn-proto/src/conversions/account.rs b/nym-vpn-core/crates/nym-vpn-proto/src/conversions/account.rs
@@ -64,7 +64,7 @@ impl TryFrom<proto::VpnApiError> for VpnApiError {
             proto::vpn_api_error::ErrorDetail::Timeout(msg) => Self::Timeout(msg),
             proto::vpn_api_error::ErrorDetail::StatusCode(e) => Self::StatusCode {
                 code: e.code.try_into().map_err(|e| {
-                    ConversionError::Generic(format!("failed to convert status code: {}", e))
+                    ConversionError::Generic(format!("failed to convert status code: {e}"))
                 })?,
                 message: e.message,
             },
diff --git a/nym-vpn-core/crates/nym-vpn-rpc-uniffi/src/lib.rs b/nym-vpn-core/crates/nym-vpn-rpc-uniffi/src/lib.rs
@@ -296,7 +296,7 @@ impl std::fmt::Display for InnerRpcError {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             InnerRpcError::RpcError(err) => write!(f, "{err}"),
-            InnerRpcError::AccountCommand(err) => write!(f, "{}", err),
+            InnerRpcError::AccountCommand(err) => write!(f, "{err}"),
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ impl From<VpnApiError> for BackendError {`
`17`	`17`	`VpnApiErrorDetail::Timeout(_) => BackendError::internal("nym-vpn-api timeout", None),`
`18`	`18`	`VpnApiErrorDetail::StatusCode(code) => BackendError::internal_with_detail(`
`19`	`19`	`"nym-vpn-api error",`
`20`		`- format!("nym-vpn-api returned: {code}"),`
	`20`	`+ format!("nym-vpn-api returned: {code:?}"),`
`21`	`21`	`),`
`22`	`22`	`VpnApiErrorDetail::Response(response) => BackendError::from(response),`
`23`	`23`	`}`