Skip to content

Commit

Permalink
test: move "make build" for webpki into generate.sh (#7885)
Browse files Browse the repository at this point in the history
webpki.go was discarding stdout when "make build" failed. We can make it
print stdout in that context, but it's more straightforward to run "make
build" from the shell script that calls webpki.go, where its stdout will
naturally be emitted.

Inspired by a recent CI run where there was a straightforward build
failure in some of Boulder's code, but it was masked by an error running
webpki.go in the `bsetup` container.
  • Loading branch information
jsha authored Dec 13, 2024
1 parent 62f1a26 commit 2678e68
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
1 change: 1 addition & 0 deletions test/certs/generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ webpki() (
# This function executes in a subshell, so this cd does not affect the parent
# script.
cd ../..
make build
mkdir ./test/certs/webpki
go run ./test/certs/webpki.go
)
Expand Down
4 changes: 0 additions & 4 deletions test/certs/webpki.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,6 @@ func main() {
_ = blog.Set(blog.StdoutLogger(6))
defer cmd.AuditPanic()

// Compile the ceremony binary for easy re-use.
_, err := exec.Command("make", "build").CombinedOutput()
cmd.FailOnError(err, "compiling ceremony tool")

// Create SoftHSM slots for the root signing keys
rsaRootKeySlot, err := createSlot("Root RSA")
cmd.FailOnError(err, "failed creating softhsm2 slot for RSA root key")
Expand Down

0 comments on commit 2678e68

Please sign in to comment.