Skip to content

Commit

Permalink
use local toolchain for Go mod tidy and disable ubi7 test (#125)
Browse files Browse the repository at this point in the history
* run go mod tidy with local Go toolchain

* target golang-fips/release and disable ubi7
  • Loading branch information
dbenoit17 authored Sep 19, 2023
1 parent 6fee13f commit d0d2186
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gating.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ jobs:
uses: golang-fips/release/.github/workflows/test-ubi-centos.yml@main
with:
go_fips_ref: ${{ github.event.pull_request.head.sha }}
composes: "ubi7,ubi8,ubi9,c8s,c9s"
composes: "ubi8,ubi9,c8s,c9s"
4 changes: 2 additions & 2 deletions scripts/create-secondary-patch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ replace="${1}"
if [ -n "${replace}" ]; then
echo "replace github.com/golang-fips/openssl-fips => ${replace}" >> go.mod
fi
go mod tidy
go mod vendor
../bin/go mod tidy
../bin/go mod vendor

# Generate the final patch.
git add .
Expand Down
6 changes: 6 additions & 0 deletions scripts/full-initialize-repo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
# This script generates and applies FIPS
# patches to a Go tree.

echo "Host Go Version:"
go version

echo "Host Go Env:"
go env

SCRIPT_DIR=$(readlink -f $(dirname $0))
GO_DIR=${SCRIPT_DIR}/../go

Expand Down
6 changes: 6 additions & 0 deletions scripts/setup-initial-patch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,12 @@ shift $((OPTIND-1))
cd ./go
ORIGINAL_GIT_SHA=$(git rev-parse HEAD)

# Build the Go toolchain before applying patches. This allows us to use this toolchain in later steps
# when running `go mod` commands.
pushd ./src
./make.bash
popd

"${ROOT}"/scripts/apply-initial-patch.sh
"${ROOT}"/scripts/create-secondary-patch.sh "${replacement}"

Expand Down

0 comments on commit d0d2186

Please sign in to comment.