Test packaging w/ SSL build (#784)

* Add CI to package test w/ ssl

* Don't build the tools

* Fix CXX env var handling

Author: justsmth

.github/workflows/integration.yml

@@ -72,8 +72,6 @@ jobs:
     runs-on: windows-latest
     strategy:
       fail-fast: false
-      matrix:
-        os: [ windows-latest ]
     steps:
       - uses: actions/checkout@v3
         with:
@@ -88,6 +86,37 @@ jobs:
         run: |
           ./scripts/run-windows-debug-crt-static-test.sh
 
+  ssl-test:
+    if: github.repository_owner == 'aws'
+    name: "SSL Test"
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ windows-latest, ubuntu-latest, macos-latest ]
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: 'recursive'
+      - uses: dtolnay/rust-toolchain@stable
+        id: toolchain
+      - name: Set Rust toolchain override
+        run: rustup override set ${{ steps.toolchain.outputs.name }}
+      - name: install bindgen-cli
+        run: cargo install --force --locked bindgen-cli
+      - uses: ilammy/setup-nasm@v1
+      - name: "Test aws-lc-sys package w/ SSL enabled"
+        working-directory: ./aws-lc-sys
+        run: cargo package --features ssl
+      - uses: actions/setup-go@v4
+        with:
+          go-version: '>=1.18'
+      - name: Install ninja-build tool
+        uses: seanmiddleditch/gha-setup-ninja@v4
+      - name: "Test aws-lc-fips-sys package w/ SSL enabled"
+        working-directory: ./aws-lc-fips-sys
+        run: cargo package --features ssl
+
   links-crate-tests:
     if: github.repository_owner == 'aws'
     name: sys crate tests

aws-lc-fips-sys/Cargo.toml

@@ -30,6 +30,8 @@ include = [
     "!/aws-lc/tests/**",
     "!/aws-lc/third_party/**",
     "!/aws-lc/util/**",
+    "!/aws-lc/tool/**",
+    "!/aws-lc/tool-openssl/**",
     "/aws-lc/tests/compiler_features_tests/**.c",
     "/aws-lc/third_party/fiat/**/LICENSE",
     "/aws-lc/third_party/fiat/**/*.h",

aws-lc-fips-sys/builder/cmake_builder.rs

@@ -177,6 +177,7 @@ impl CmakeBuilder {
 
         // Build flags that minimize our crate size.
         cmake_cfg.define("BUILD_TESTING", "OFF");
+        cmake_cfg.define("BUILD_TOOL", "OFF");
         if cfg!(feature = "ssl") {
             cmake_cfg.define("BUILD_LIBSSL", "ON");
         } else {

aws-lc-sys/Cargo.toml

@@ -28,6 +28,8 @@ include = [
     "!/aws-lc/tests/**",
     "!/aws-lc/third_party/**",
     "!/aws-lc/util/**",
+    "!/aws-lc/tool/**",
+    "!/aws-lc/tool-openssl/**",
     "/aws-lc/tests/compiler_features_tests/**.c",
     "/aws-lc/third_party/fiat/**/LICENSE",
     "/aws-lc/third_party/fiat/**/*.h",

aws-lc-sys/builder/cc_builder.rs

@@ -202,7 +202,7 @@ impl CcBuilder {
             set_env_for_target("CC", &cc);
         }
         if let Some(cxx) = optional_env_optional_crate_target("CXX") {
-            set_env_for_target("CC", &cxx);
+            set_env_for_target("CXX", &cxx);
         }
 
         if target_arch() == "x86" && !compiler_is_msvc {

aws-lc-sys/builder/cmake_builder.rs

@@ -110,6 +110,7 @@ impl CmakeBuilder {
 
         // Build flags that minimize our crate size.
         cmake_cfg.define("BUILD_TESTING", "OFF");
+        cmake_cfg.define("BUILD_TOOL", "OFF");
         if cfg!(feature = "ssl") {
             cmake_cfg.define("BUILD_LIBSSL", "ON");
         } else {