fix: update vcpkg cache keys for release triplets

perpetus · perpetus · commit fd35cf2d8a06 · 2025-12-24T14:38:09.000+05:30
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -2,10 +2,7 @@ name: Release Build
 
 on:
   push:
-    branches: [ "master", "main" ]
     tags: [ "v*" ]
-  pull_request:
-    branches: [ "master", "main" ]
   workflow_dispatch:
 
 env:
@@ -34,9 +31,9 @@ jobs:
         uses: actions/cache@v4
         with:
           path: vcpkg_installed
-          key: ${{ runner.os }}-vcpkg-static-${{ hashFiles('vcpkg.json') }}
+          key: ${{ runner.os }}-vcpkg-static-release-${{ hashFiles('vcpkg.json') }}
           restore-keys: |
-            ${{ runner.os }}-vcpkg-
+            ${{ runner.os }}-vcpkg-static-release-
 
       - name: Setup vcpkg
         uses: lukka/run-vcpkg@v11
@@ -47,7 +44,8 @@ jobs:
           runVcpkgInstall: true
         env:
           VCPKG_INSTALLED_DIR: ${{ github.workspace }}/vcpkg_installed
-          VCPKG_DEFAULT_TRIPLET: x64-windows-static
+          VCPKG_DEFAULT_TRIPLET: x64-windows-static-release
+          VCPKG_OVERLAY_TRIPLETS: ${{ github.workspace }}/triplets
 
       - name: Cargo Chef Prepare
         run: cargo chef prepare --recipe-path recipe.json
@@ -65,8 +63,8 @@ jobs:
         env:
           VCPKG_ROOT: ${{ github.workspace }}\vcpkg
           VCPKG_INSTALLED_DIR: ${{ github.workspace }}\vcpkg_installed
-          VCPKGRS_TRIPLET: x64-windows-static
-          PKG_CONFIG_PATH: ${{ github.workspace }}\vcpkg_installed\x64-windows-static\lib\pkgconfig
+          VCPKGRS_TRIPLET: x64-windows-static-release
+          PKG_CONFIG_PATH: ${{ github.workspace }}\vcpkg_installed\x64-windows-static-release\lib\pkgconfig
 
       - name: Restore Source Code
         run: git restore server enginefs libtorrent-sys
@@ -78,8 +76,8 @@ jobs:
         env:
           VCPKG_ROOT: ${{ github.workspace }}\vcpkg
           VCPKG_INSTALLED_DIR: ${{ github.workspace }}\vcpkg_installed
-          VCPKGRS_TRIPLET: x64-windows-static
-          PKG_CONFIG_PATH: ${{ github.workspace }}\vcpkg_installed\x64-windows-static\lib\pkgconfig
+          VCPKGRS_TRIPLET: x64-windows-static-release
+          PKG_CONFIG_PATH: ${{ github.workspace }}\vcpkg_installed\x64-windows-static-release\lib\pkgconfig
 
       - name: Upload EXE
         uses: actions/upload-artifact@v4
@@ -92,16 +90,16 @@ jobs:
         env:
           VCPKG_ROOT: ${{ github.workspace }}\vcpkg
           VCPKG_INSTALLED_DIR: ${{ github.workspace }}\vcpkg_installed
-          VCPKGRS_TRIPLET: x64-windows-static
-          PKG_CONFIG_PATH: ${{ github.workspace }}\vcpkg_installed\x64-windows-static\lib\pkgconfig
+          VCPKGRS_TRIPLET: x64-windows-static-release
+          PKG_CONFIG_PATH: ${{ github.workspace }}\vcpkg_installed\x64-windows-static-release\lib\pkgconfig
 
       - name: Build MSI Installer
         run: cargo wix --package server --no-build --nocapture --target x86_64-pc-windows-msvc
         env:
           VCPKG_ROOT: ${{ github.workspace }}\vcpkg
           VCPKG_INSTALLED_DIR: ${{ github.workspace }}\vcpkg_installed
-          VCPKGRS_TRIPLET: x64-windows-static
-          PKG_CONFIG_PATH: ${{ github.workspace }}\vcpkg_installed\x64-windows-static\lib\pkgconfig
+          VCPKGRS_TRIPLET: x64-windows-static-release
+          PKG_CONFIG_PATH: ${{ github.workspace }}\vcpkg_installed\x64-windows-static-release\lib\pkgconfig
 
 
       - name: Upload MSI
@@ -140,9 +138,9 @@ jobs:
         uses: actions/cache@v4
         with:
           path: vcpkg_installed
-          key: ${{ runner.os }}-vcpkg-${{ hashFiles('vcpkg.json') }}
+          key: ${{ runner.os }}-vcpkg-release-${{ hashFiles('vcpkg.json') }}
           restore-keys: |
-            ${{ runner.os }}-vcpkg-
+            ${{ runner.os }}-vcpkg-release-
 
       - name: Setup vcpkg
         uses: lukka/run-vcpkg@v11
@@ -153,6 +151,8 @@ jobs:
           runVcpkgInstall: true
         env:
           VCPKG_INSTALLED_DIR: ${{ github.workspace }}/vcpkg_installed
+          VCPKG_DEFAULT_TRIPLET: x64-linux-release
+          VCPKG_OVERLAY_TRIPLETS: ${{ github.workspace }}/triplets
 
       - name: Cargo Chef Prepare
         run: cargo chef prepare --recipe-path recipe.json
@@ -165,12 +165,12 @@ jobs:
 
       - name: Cargo Chef Cook
         run: |
-           export VCPKG_ROOT=${{ github.workspace }}/vcpkg
-           cargo chef cook --release --recipe-path recipe.json --features libtorrent --no-default-features
+          export VCPKG_ROOT=${{ github.workspace }}/vcpkg
+          cargo chef cook --release --recipe-path recipe.json --features libtorrent --no-default-features
         env:
-           VCPKG_ROOT: ${{ github.workspace }}/vcpkg
-           VCPKG_INSTALLED_DIR: ${{ github.workspace }}/vcpkg_installed
-           PKG_CONFIG_PATH: ${{ github.workspace }}/vcpkg_installed/x64-linux/lib/pkgconfig
+          VCPKG_ROOT: ${{ github.workspace }}/vcpkg
+          VCPKG_INSTALLED_DIR: ${{ github.workspace }}/vcpkg_installed
+          PKG_CONFIG_PATH: ${{ github.workspace }}/vcpkg_installed/x64-linux-release/lib/pkgconfig
 
       - name: Restore Source Code
         run: git restore server enginefs libtorrent-sys
@@ -180,7 +180,7 @@ jobs:
         env:
           VCPKG_ROOT: ${{ github.workspace }}/vcpkg
           VCPKG_INSTALLED_DIR: ${{ github.workspace }}/vcpkg_installed
-          PKG_CONFIG_PATH: ${{ github.workspace }}/vcpkg_installed/x64-linux/lib/pkgconfig
+          PKG_CONFIG_PATH: ${{ github.workspace }}/vcpkg_installed/x64-linux-release/lib/pkgconfig
 
       - name: Build DEB Package
         run: cargo deb --package server --no-build
diff --git a/libtorrent-sys/build.rs b/libtorrent-sys/build.rs
@@ -1,5 +1,5 @@
 fn main() {
-    let include_paths = find_libtorrent();
+    let (include_paths, using_vcpkg) = find_libtorrent();
 
     // Build the cxx bridge
     let mut build = cxx_build::bridge("src/lib.rs");
@@ -16,9 +16,11 @@ fn main() {
         .flag_if_supported("-Wno-unused-parameter")
         .flag_if_supported("-Wno-missing-field-initializers");
 
-    // Set TORRENT_ABI_VERSION for ALL platforms to match vcpkg-built libtorrent
-    // This is critical - without it, C++ name mangling differs and linking fails
-    build.define("TORRENT_ABI_VERSION", "3");
+    // Only set TORRENT_ABI_VERSION when using vcpkg-built libtorrent
+    // System packages (e.g., Arch Linux) use their own ABI version and don't need this
+    if using_vcpkg {
+        build.define("TORRENT_ABI_VERSION", "3");
+    }
     build.define("TORRENT_USE_OPENSSL", None);
 
     if cfg!(target_os = "windows") {
@@ -40,15 +42,17 @@ fn main() {
     println!("cargo:rerun-if-changed=cpp/wrapper.h");
 }
 
-fn find_libtorrent() -> Vec<std::path::PathBuf> {
+/// Returns (include_paths, using_vcpkg)
+/// using_vcpkg is true when vcpkg was used to find the library
+fn find_libtorrent() -> (Vec<std::path::PathBuf>, bool) {
     let mut errors = String::new();
 
-    // Try pkg-config first
+    // Try pkg-config first (system packages like on Arch Linux)
     match pkg_config::Config::new()
         .atleast_version("2.0")
         .probe("libtorrent-rasterbar")
     {
-        Ok(lib) => return lib.include_paths,
+        Ok(lib) => return (lib.include_paths, false), // NOT vcpkg
         Err(e) => {
             errors.push_str(&format!("pkg-config: {}\n", e));
         }
@@ -58,7 +62,7 @@ fn find_libtorrent() -> Vec<std::path::PathBuf> {
     if cfg!(target_os = "windows") {
         unsafe {
             std::env::set_var("VCPKGRS_DYNAMIC", "0");
-            std::env::set_var("VCPKGRS_TRIPLET", "x64-windows-static");
+            std::env::set_var("VCPKGRS_TRIPLET", "x64-windows-static-release");
         }
     }
 
@@ -67,7 +71,7 @@ fn find_libtorrent() -> Vec<std::path::PathBuf> {
         .emit_includes(true)
         .find_package("libtorrent")
     {
-        Ok(lib) => return lib.include_paths,
+        Ok(lib) => return (lib.include_paths, true), // IS vcpkg
         Err(e) => {
             errors.push_str(&format!("vcpkg (libtorrent): {}\n", e));
         }
@@ -78,7 +82,7 @@ fn find_libtorrent() -> Vec<std::path::PathBuf> {
         .emit_includes(true)
         .find_package("libtorrent-rasterbar")
     {
-        Ok(lib) => return lib.include_paths,
+        Ok(lib) => return (lib.include_paths, true), // IS vcpkg
         Err(e) => {
             errors.push_str(&format!("vcpkg (libtorrent-rasterbar): {}\n", e));
         }
diff --git a/triplets/x64-linux-release.cmake b/triplets/x64-linux-release.cmake
@@ -0,0 +1,7 @@
+set(VCPKG_TARGET_ARCHITECTURE x64)
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE static)
+set(VCPKG_CMAKE_SYSTEM_NAME Linux)
+
+# Release only - skip debug builds to save time
+set(VCPKG_BUILD_TYPE release)
diff --git a/triplets/x64-windows-static-release.cmake b/triplets/x64-windows-static-release.cmake
@@ -0,0 +1,6 @@
+set(VCPKG_TARGET_ARCHITECTURE x64)
+set(VCPKG_CRT_LINKAGE static)
+set(VCPKG_LIBRARY_LINKAGE static)
+
+# Release only - skip debug builds to save time
+set(VCPKG_BUILD_TYPE release)
