CI cleanup (#634)

aws · Dec 17, 2024 · 14d2457 · 14d2457
1 parent ca788c7
commit 14d2457
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 22 deletions.
diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
@@ -18,10 +18,6 @@ env:
   # Otherwise, we test against the latest version.
   RUST_NIGHTLY_TOOLCHAIN: nightly
   RUST_SCRIPT_NIGHTLY_TOOLCHAIN: nightly-2024-05-22
-  # Mirai version tag, updates this whenever a new version
-  # is released.
-  MIRAI_TOOLCHAIN: nightly-2023-05-09
-  MIRAI_TAG: v1.1.8
 
 jobs:
   rustfmt:

diff --git a/.github/workflows/fips.yml b/.github/workflows/fips.yml
@@ -53,9 +53,7 @@ jobs:
           go-version: '>=1.18'
       - name: Run cargo test
         working-directory: ./aws-lc-rs
-        # Doc-tests fail to link with dynamic build
-        # See: https://github.com/rust-lang/cargo/issues/8531
-        run: cargo test --tests ${{ matrix.args }}
+        run: cargo test ${{ matrix.args }}
   windows-fips-test:
     if: github.repository_owner == 'aws'
     name: aws-lc-rs windows-fips-tests
@@ -87,6 +85,4 @@ jobs:
         uses: seanmiddleditch/gha-setup-ninja@v4
       - name: Run cargo test
         working-directory: ./aws-lc-rs
-        # Doc-tests fail to link with dynamic build
-        # See: https://github.com/rust-lang/cargo/issues/8531
-        run: cargo test --tests ${{ matrix.args }}
+        run: cargo test ${{ matrix.args }}
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -135,11 +135,11 @@ jobs:
       - name: Clean
         run: cargo clean
       - name: Force Linux shared build
+        env:
+          AWS_LC_SYS_STATIC: 0
+          AWS_LC_FIPS_SYS_STATIC: 0
         working-directory: ./${{ matrix.crate }}
-        if: ${{ matrix.os == 'ubuntu-latest' }}
-        # Doc-tests fail to link with dynamic build
-        # See: https://github.com/rust-lang/cargo/issues/8531
-        run: AWS_LC_SYS_STATIC=0 AWS_LC_FIPS_SYS_STATIC=0 cargo publish --dry-run
+        run: cargo publish --dry-run
 
   ## Verify that prebuilt-nasm objects were published properly
   publish-dry-run-prebuild-nasm:

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -343,9 +343,7 @@ jobs:
           go-version: '>=1.18'
       - name: Run cargo test
         if: ${{ matrix.os == 'ubuntu-latest' || matrix.static != 1 }}
-        # Doc-tests fail to link with dynamic build
-        # See: https://github.com/rust-lang/cargo/issues/8531
-        run: cargo test -p aws-lc-rs --tests --no-default-features --features fips
+        run: cargo test -p aws-lc-rs --no-default-features --features fips
 
   build-env-no-asm-test:
     if: github.repository_owner == 'aws'
@@ -545,10 +543,10 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           go-version: '>=1.18'
-      # FIPS builds for ARM platforms (e.g, macos-14-xlarge) will fail until upstream change is made:
-      # https://github.com/aws/aws-lc/pull/2005
-      - if: matrix.os != 'macos-14-xlarge' || matrix.fips != 1
-        name: Run cargo test
+      - name: Run cargo test
+        # macOS aarch64 fix for FIPS pending the following PR applied to FIPS branch:
+        # https://github.com/aws/aws-lc/pull/2005
+        if: ${{ matrix.fips == 0 || matrix.os != 'macos-14-xlarge' }}
         working-directory: "path has spaces/aws-lc-rs"
         run: cargo test --tests -p aws-lc-rs --no-default-features --features ${{ (matrix.fips == 1 && 'fips') || 'aws-lc-sys' }}
 

diff --git a/aws-lc-fips-sys/builder/cmake_builder.rs b/aws-lc-fips-sys/builder/cmake_builder.rs
@@ -197,7 +197,10 @@ impl CmakeBuilder {
         // If the build environment vendor is Apple
         #[cfg(target_vendor = "apple")]
         {
-            cmake_cfg.cflag("-Wno-overriding-t-option");
+            const NO_OVERRIDE_T_OPTION: &str = "-Wno-overriding-t-option";
+            if let Ok(true) = cc_build.is_flag_supported(NO_OVERRIDE_T_OPTION) {
+                cmake_cfg.cflag(NO_OVERRIDE_T_OPTION);
+            }
             if target_arch() == "aarch64" {
                 cmake_cfg.define("CMAKE_OSX_ARCHITECTURES", "arm64");
                 cmake_cfg.define("CMAKE_SYSTEM_PROCESSOR", "arm64");