From e8322505abf21fe4809947cb7dd2139d7c0b54ab Mon Sep 17 00:00:00 2001 From: Wade Simmons Date: Fri, 24 Jul 2026 08:17:52 -0400 Subject: [PATCH] fix fips140-all --- .github/workflows/smoke.yml | 2 +- .github/workflows/test.yml | 4 ++-- Makefile | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml index dc274932..99d9bfe2 100644 --- a/.github/workflows/smoke.yml +++ b/.github/workflows/smoke.yml @@ -38,6 +38,6 @@ jobs: run: make boringcrypto smoke-docker - name: Smoke Docker fips140 - run: make fips140-all smoke-docker + run: make fips140-all GOALS=smoke-docker timeout-minutes: 10 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index eab4e4c6..6bde71e8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -64,8 +64,8 @@ jobs: - name: linux-fips140 os: ubuntu-latest build-cmd: make fips140-all - test-cmd: make fips140-all test - e2e-cmd: make fips140-all e2evv + test-cmd: make fips140-all GOALS=test + e2e-cmd: make fips140-all GOALS=e2evv - name: linux-pkcs11 os: ubuntu-latest build-cmd: make bin-pkcs11 diff --git a/Makefile b/Makefile index b58aed9c..5c268296 100644 --- a/Makefile +++ b/Makefile @@ -296,9 +296,9 @@ fips140-$(1): fips140 endef $(foreach _rule, $(ALL_GOFIPS140), $(eval $(call FIPS140_rule,$(_rule)))) -# Iterate and run the goals for all fips versions, like `make fips140-all test` +# Iterate and run the goals for all fips versions, like `make fips140-all GOALS=test` fips140-all: - @$(foreach _v,$(ALL_GOFIPS140),$(MAKE) fips140-$(_v) $(filter-out fips140-all,$(MAKECMDGOALS)) &&) true + @$(foreach _v,$(ALL_GOFIPS140),$(MAKE) fips140-$(_v) $(GOALS) &&) true # Useful to chain together, like: # - make boringcrypto e2evv