Merge pull request #1079 from input-output-hk/djo/1073/bundle-openssl

Bundle openssl with released binaries

.github/workflows/actions/build-upload-mithril-artifact/action.yml

@@ -8,14 +8,19 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - name: Add commit short sha to Cargo.tomls version
+    - name: Get label to append to crate versions
+      id: label
       shell: bash
+      run: echo "short_sha=$(echo ${{ github.sha }} | cut -c1-7)" >> $GITHUB_OUTPUT
+
+    - name: Add commit short sha to Cargo.tomls version
+      shell: ${{ runner.os == 'Windows' && 'pwsh' || 'bash' }}
       run: |
         pip3 install toml
-        python3 ./.github/workflows/scripts/edit-cargo-toml-version.py -l $(echo ${{ github.sha }} | cut -c1-7)
+        python3 ./.github/workflows/scripts/edit-cargo-toml-version.py -l "${{ steps.label.outputs.short_sha }}"
 
     - name: Cargo build - Distribution
-      shell: bash
+      shell: ${{ runner.os == 'Windows' && 'pwsh' || 'bash' }}
       run: cargo build --release ${{ inputs.build-args }}
 
     - name: Publish Mithril Distribution (${{ runner.os }}-${{ runner.arch }})

.github/workflows/ci.yml

@@ -40,6 +40,8 @@ jobs:
 
       - name: Build Mithril workspace & publish artifacts
         uses: ./.github/workflows/actions/build-upload-mithril-artifact
+        with:
+          build-args: --features bundle_openssl
 
       - name: Build Debian packages
         shell: bash
@@ -95,7 +97,7 @@ jobs:
       - name: Build Mithril workspace & publish artifacts
         uses: ./.github/workflows/actions/build-upload-mithril-artifact
         with:
-          build-args: ${{ matrix.build-args }}
+          build-args: --features bundle_openssl ${{ matrix.build-args }}
 
   test:
     strategy:
@@ -131,7 +133,11 @@ jobs:
         shell: bash
         run: |
           cargo nextest run --profile ci ${{ matrix.test-args }}
-          # Rename junit file to include runner info
+          
+      - name: Rename junit file to include runner info
+        shell: bash
+        if: success() || failure()
+        run: |
           mv target/nextest/ci/tests-result.junit.xml test-results${{ matrix.artifact-suffix }}-${{ runner.os }}-${{ runner.arch }}.xml
 
       - name: Upload Tests Results

mithril-aggregator/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-aggregator"
-version = "0.3.54"
+version = "0.3.55"
 description = "A Mithril Aggregator server"
 authors = { workspace = true }
 edition = { workspace = true }
@@ -18,6 +18,8 @@ config = "0.13.1"
 flate2 = "1.0.23"
 hex = "0.4.3"
 mithril-common = { path = "../mithril-common" }
+openssl = { version = "*", features = ["vendored"], optional = true }
+openssl-probe = { version = "0.1.5", optional = true }
 reqwest = { version = "0.11", features = ["json"] }
 semver = "1.0.16"
 serde = { version = "1.0", features = ["derive"] }
@@ -46,3 +48,4 @@ tempfile = "3.3.0"
 
 [features]
 portable = ["mithril-common/portable"] # portable feature avoids SIGILL crashes on CPUs not supporting Intel ADX instruction set when built on CPUs that support it
+bundle_openssl = ["dep:openssl", "dep:openssl-probe"]

mithril-aggregator/src/main.rs

@@ -23,5 +23,8 @@ async fn main() -> Result<(), String> {
     let args = MainOpts::parse();
     let _guard = slog_scope::set_global_logger(build_logger(&args));
 
+    #[cfg(feature = "bundle_openssl")]
+    openssl_probe::init_ssl_cert_env_vars();
+
     args.execute().await.map_err(|e| e.to_string())
 }

mithril-client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-client"
-version = "0.3.21"
+version = "0.3.22"
 description = "A Mithril Client"
 authors = { workspace = true }
 edition = { workspace = true }
@@ -24,6 +24,8 @@ hex = "0.4.3"
 human_bytes = { version = "0.4.2", features = ["fast"] }
 indicatif = { version = "0.17.5", features = ["tokio"] }
 mithril-common = { path = "../mithril-common" }
+openssl = { version = "*", features = ["vendored"], optional = true }
+openssl-probe = { version = "0.1.5", optional = true }
 reqwest = { version = "0.11", features = ["json", "stream"] }
 semver = "1.0"
 serde = { version = "1.0", features = ["derive"] }
@@ -43,3 +45,4 @@ mockall = "0.11.0"
 
 [features]
 portable = ["mithril-common/portable"]
+bundle_openssl = ["dep:openssl", "dep:openssl-probe"]

mithril-client/src/main.rs

@@ -122,6 +122,9 @@ async fn main() -> Result<(), String> {
     let args = Args::parse();
     let _guard = slog_scope::set_global_logger(args.build_logger());
 
+    #[cfg(feature = "bundle_openssl")]
+    openssl_probe::init_ssl_cert_env_vars();
+
     args.execute()
         .await
         .map_err(|e| format!("An error occured: {e}"))

mithril-common/Cargo.toml

@@ -78,4 +78,3 @@ serde_yaml = "0.9.10"
 default = []
 portable = ["mithril-stm/portable"] # portable feature avoids SIGILL crashes on CPUs not supporting Intel ADX instruction set when built on CPUs that support it
 allow_skip_signer_certification = []
-

mithril-signer/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-signer"
-version = "0.2.62"
+version = "0.2.63"
 description = "A Mithril Signer"
 authors = { workspace = true }
 edition = { workspace = true }
@@ -15,6 +15,8 @@ clap = { version = "4.0", features = ["derive", "env"] }
 config = "0.13.1"
 hex = "0.4.3"
 mithril-common = { path = "../mithril-common" }
+openssl = { version = "*", features = ["vendored"], optional = true }
+openssl-probe = { version = "0.1.5", optional = true }
 rand_chacha = "0.3.1"
 rand_core   = "0.6.3"
 reqwest = { version = "0.11", features = ["json", "stream"] }
@@ -36,3 +38,4 @@ slog-term = "2.9.0"
 
 [features]
 portable = ["mithril-common/portable"] # portable feature avoids SIGILL crashes on CPUs not supporting Intel ADX instruction set when built on CPUs that support it
+bundle_openssl = ["dep:openssl", "dep:openssl-probe"]

mithril-signer/src/main.rs

@@ -77,6 +77,9 @@ async fn main() -> Result<(), String> {
     let args = Args::parse();
     let _guard = slog_scope::set_global_logger(build_logger(args.log_level()));
 
+    #[cfg(feature = "bundle_openssl")]
+    openssl_probe::init_ssl_cert_env_vars();
+
     debug!("Starting"; "node_version" => env!("CARGO_PKG_VERSION"));
 
     // Load config