From b28f70b6596974a11d60c261b91b3bf43a9cd973 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MARQUET?= <72651575+BreizhHardware@users.noreply.github.com> Date: Thu, 12 Jun 2025 20:23:06 +0200 Subject: [PATCH] refactor(rust): add support for vendored OpenSSL in CI configuration --- .github/workflows/create_dev.yml | 8 +++++--- .github/workflows/create_release.yml | 4 +++- Cargo.toml | 6 +++++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/create_dev.yml b/.github/workflows/create_dev.yml index dab2c0f..f51312b 100644 --- a/.github/workflows/create_dev.yml +++ b/.github/workflows/create_dev.yml @@ -35,22 +35,24 @@ jobs: - name: Installer cross run: cargo install cross - - name: Créer Cross.toml pour spécifier OpenSSL statique + - name: Créer Cross.toml pour spécifier OpenSSL vendored run: | cat > Cross.toml << 'EOF' [build.env] passthrough = [ "RUSTFLAGS", "OPENSSL_STATIC", + "OPENSSL_NO_VENDOR" ] EOF - - name: Construire avec cross + - name: Construire avec cross et OpenSSL vendored env: OPENSSL_STATIC: 1 RUSTFLAGS: "-C target-feature=+crt-static" + OPENSSL_NO_VENDOR: 0 run: | - cross build --release --target ${{ matrix.target }} + cross build --release --target ${{ matrix.target }} --features vendored-openssl - name: Préparer le binaire run: | diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index 11b05a6..e7bf7d6 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -74,6 +74,7 @@ jobs: passthrough = [ "RUSTFLAGS", "OPENSSL_STATIC", + "OPENSSL_NO_VENDOR" ] EOF @@ -81,8 +82,9 @@ jobs: env: OPENSSL_STATIC: 1 RUSTFLAGS: "-C target-feature=+crt-static" + OPENSSL_NO_VENDOR: 0 run: | - cross build --release --target ${{ matrix.target }} + cross build --release --target ${{ matrix.target }} --features vendored-openssl - name: Préparer le binaire run: | diff --git a/Cargo.toml b/Cargo.toml index 854ce9d..b3444de 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,6 +7,9 @@ edition = "2021" name = "github-ntfy" path = "src/main.rs" +[features] +vendored-openssl = ["openssl/vendored"] + [dependencies] tokio = { version = "1", features = ["full"] } reqwest = { version = "0.11", features = ["json", "blocking"] } @@ -17,4 +20,5 @@ log = "0.4" env_logger = "0.10" dotenv = "0.15" chrono = "0.4" -warp = "0.3" \ No newline at end of file +warp = "0.3" +openssl = { version = "0.10", features = ["vendored"] } \ No newline at end of file