From: Daniel McCarney <daniel@binaryparadox.net>
Date: Sun, 16 Mar 2025 16:48:54 +0000 (-0400)
Subject: ci: use rustls-ffi 0.15 deb
X-Git-Tag: curl-8_13_0~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6fa31a30434a3751c95404025f4bcfbd4b23e828;p=thirdparty%2Fcurl.git

ci: use rustls-ffi 0.15 deb

Take the latest rustls-ffi version and install it via the upstream
project's `.deb` for x86_64 linux.
---

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 425bd7e696..d9b7322f92 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -57,7 +57,7 @@ env:
   # handled in renovate.json
   quictls-version: 3.3.0
   # renovate: datasource=github-tags depName=rustls/rustls-ffi versioning=semver registryUrl=https://github.com
-  rustls-version: 0.14.1
+  rustls-version: 0.15.0
 
 jobs:
   linux:
@@ -268,12 +268,11 @@ jobs:
           - name: rustls valgrind
             install_packages: valgrind
             install_steps: rust rustls pytest
-            configure: --with-rustls=$HOME/rustls --enable-debug
+            configure: --with-rustls --enable-debug
 
           - name: rustls
             install_steps: rust rustls skipall
-            PKG_CONFIG_PATH: '$HOME/rustls/lib/pkgconfig'  # Not built as of v0.14.0
-            generate: -DCURL_USE_RUSTLS=ON -DRUSTLS_INCLUDE_DIR=$HOME/rustls/include -DRUSTLS_LIBRARY=$HOME/rustls/lib/librustls.a -DENABLE_DEBUG=ON
+            generate: -DCURL_USE_RUSTLS=ON -DENABLE_DEBUG=ON
 
           - name: IntelC openssl
             install_packages: zlib1g-dev libssl-dev
@@ -551,20 +550,19 @@ jobs:
           path: ~/rustls
           key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ env.rustls-version }}
 
-      - name: 'install rust'
-        if: contains(matrix.build.install_steps, 'rust') && steps.cache-rustls.outputs.cache-hit != 'true'
+      - name: 'fetch rustls deb'
+        if: contains(matrix.build.install_steps, 'rustls') && steps.cache-rustls.outputs.cache-hit != 'true'
         run: |
-          cd $HOME
-          curl -sSf --compressed https://sh.rustup.rs/ | sh -s -- -y
-          source $HOME/.cargo/env
-          rustup toolchain install stable --profile minimal
+          mkdir -p ~/rustls
+          curl -L https://github.com/rustls/rustls-ffi/releases/download/v${{ env.rustls-version }}/librustls_${{ env.rustls-version }}_amd64.deb.zip -o ~/rustls/librustls.zip
+          unzip ~/rustls/librustls.zip -d ~/rustls
+          rm ~/rustls/librustls.zip
 
       - name: 'build rustls'
-        if: contains(matrix.build.install_steps, 'rustls') && steps.cache-rustls.outputs.cache-hit != 'true'
+        # Note: we don't check cache-hit here. If the cache is hit, we still need to dpkg install the deb.
+        if: contains(matrix.build.install_steps, 'rustls')
         run: |
-          git clone --quiet --depth=1 -b v${{ env.rustls-version }} --recursive https://github.com/rustls/rustls-ffi.git
-          cd rustls-ffi
-          make DESTDIR=$HOME/rustls install
+          sudo dpkg -i ~/rustls/librustls_${{ env.rustls-version }}_amd64.deb
 
       - name: 'install Intel compilers'
         if: contains(matrix.build.install_steps, 'intel')