From ac5a18e56a9122d8371aef7a2026b71e0272bf13 Mon Sep 17 00:00:00 2001
From: Wade Simmons <wade@wades.im>
Date: Wed, 10 Jun 2026 09:43:41 -0400
Subject: [PATCH] use fips140-all in CI tests

---
 .github/workflows/smoke.yml | 53 ++++++-------------------------------
 .github/workflows/test.yml  |  6 ++---
 Makefile                    |  2 +-
 3 files changed, 12 insertions(+), 49 deletions(-)

diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml
index 57a5d1c0..d7422c7f 100644
--- a/.github/workflows/smoke.yml
+++ b/.github/workflows/smoke.yml
@@ -25,53 +25,16 @@ jobs:
         go-version: '1.26'
         check-latest: true
 
-    - name: build
-      run: make bin-docker CGO_ENABLED=1 BUILD_ARGS=-race
+    - name: Smoke Docker
+      run: make smoke-docker-race
 
-    - name: setup docker image
-      working-directory: ./.github/workflows/smoke
-      run: ./build.sh
+    - name: Smoke Relay Docker
+      run: make smoke-relay-docker
 
-    - name: run smoke
-      working-directory: ./.github/workflows/smoke
-      run: ./smoke.sh
+    - name: Smoke Docker boringcrypto
+      run: make boringcrypto smoke-docker-race
 
-    - name: setup relay docker image
-      working-directory: ./.github/workflows/smoke
-      run: ./build-relay.sh
-
-    - name: run smoke relay
-      working-directory: ./.github/workflows/smoke
-      run: ./smoke-relay.sh
-
-    - name: setup docker image for P256
-      working-directory: ./.github/workflows/smoke
-      run: NAME="smoke-p256" CURVE=P256 ./build.sh
-
-    - name: run smoke-p256
-      working-directory: ./.github/workflows/smoke
-      run: NAME="smoke-p256" ./smoke.sh
-
-    - name: build for boringcrypto
-      run: make boringcrypto bin-docker CGO_ENABLED=1 BUILD_ARGS=-race
-
-    - name: setup docker image for boringcrypto
-      working-directory: ./.github/workflows/smoke
-      run: NAME="smoke-boringcrypto" CURVE=P256 ./build.sh
-
-    - name: run smoke-boringcrypto
-      working-directory: ./.github/workflows/smoke
-      run: NAME="smoke-boringcrypto" ./smoke.sh
-
-    - name: build for fips140
-      run: make fips140 bin-docker CGO_ENABLED=1 BUILD_ARGS=-race
-
-    - name: setup docker image for fips140
-      working-directory: ./.github/workflows/smoke
-      run: NAME="smoke-fips140" CURVE=P256 ./build.sh
-
-    - name: run smoke-fips140
-      working-directory: ./.github/workflows/smoke
-      run: NAME="smoke-fips140" ./smoke.sh
+    - name: Smoke Docker fips140
+      run: make fips140-all smoke-docker-race
 
     timeout-minutes: 10
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cabe6148..40066574 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -63,9 +63,9 @@ jobs:
           e2e-cmd: make boringcrypto e2evv
         - name: linux-fips140
           os: ubuntu-latest
-          build-cmd: make fips140
-          test-cmd: make fips140 test
-          e2e-cmd: make fips140 e2evv
+          build-cmd: make fips140-all
+          test-cmd: make fips140-all test
+          e2e-cmd: make fips140-all e2evv
         - name: linux-pkcs11
           os: ubuntu-latest
           build-cmd: make bin-pkcs11
diff --git a/Makefile b/Makefile
index 07c846b6..1c40778c 100644
--- a/Makefile
+++ b/Makefile
@@ -329,7 +329,7 @@ smoke-relay-docker: bin-docker
 	cd .github/workflows/smoke/ && $(GOENV) ./smoke-relay.sh
 
 smoke-docker-race: BUILD_ARGS += -race
-smoke-docker-race: CGO_ENABLED = 1
+smoke-docker-race: GOENV += CGO_ENABLED=1
 smoke-docker-race: smoke-docker
 
 smoke-vagrant/%: bin-docker build/%/nebula