From c42c99edebb6313c0c821ab3e9682fbd75d20454 Mon Sep 17 00:00:00 2001 From: Emmanuel Coste Date: Fri, 25 Apr 2025 23:05:47 +0200 Subject: [PATCH] ci: build on rockylinux for glibc 2.28 support --- .github/scripts/get_openssl_binaries.sh | 1 - .github/workflows/main_base.yml | 4 ++-- Cargo.lock | 4 ++-- README.md | 3 +-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/scripts/get_openssl_binaries.sh b/.github/scripts/get_openssl_binaries.sh index c59778d0..68be7a42 100755 --- a/.github/scripts/get_openssl_binaries.sh +++ b/.github/scripts/get_openssl_binaries.sh @@ -33,6 +33,5 @@ mv "${OPENSSL_VERSION}.tar.gz" "${OPENSSL_DIR}" echo -n Extracting compressed archive... cd "${OPENSSL_DIR}" tar -xf "$OPENSSL_VERSION.tar.gz" -find . chmod u+x lib*/ossl-modules/* rm "$OPENSSL_VERSION.tar.gz" diff --git a/.github/workflows/main_base.yml b/.github/workflows/main_base.yml index ff496f2a..206672d1 100644 --- a/.github/workflows/main_base.yml +++ b/.github/workflows/main_base.yml @@ -30,7 +30,7 @@ jobs: with: toolchain: ${{ inputs.toolchain }} - build: + build: # Build on Ubuntu 22/24, Rocky 8/9, MacOS 13/15 and Windows 22 uses: Cosmian/reusable_workflows/.github/workflows/build_all.yml@develop secrets: inherit with: @@ -56,7 +56,7 @@ jobs: fips: true ############################################################################## - ### Releases + ### Push binaries on package.cosmian.com and make Release ############################################################################## push-artifacts: needs: diff --git a/Cargo.lock b/Cargo.lock index 626ae18a..a6683701 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2712,7 +2712,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2 0.5.9", "tokio", "tower-service", "tracing", @@ -3517,7 +3517,7 @@ version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51e219e79014df21a225b1860a479e2dcd7cbd9130f4defd4bd0e191ea31d67d" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "chrono", "getrandom 0.2.15", "http 1.3.1", diff --git a/README.md b/README.md index 83ee2dce..459d9cb7 100644 --- a/README.md +++ b/README.md @@ -186,8 +186,7 @@ vcpkg integrate install Once OpenSSL is installed, you can build the KMS. To avoid the _additive feature_ issues, the main artifacts - the CLI, the KMS server and the PKCS11 provider - should directly be built using `cargo build --release` within their own crate, -not -from the project root. +not from the project root. Build the server and CLI binaries: