Skip to content

Commit

Permalink
Merge branch 'v1' into dependabot/go_modules/golang.org/x/sync-0.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
matthewdale authored Apr 25, 2024
2 parents e2e6d90 + 0a49689 commit a7360fa
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: pre-commit/[email protected].0
- uses: actions/setup-python@v5
- uses: pre-commit/[email protected].1
13 changes: 6 additions & 7 deletions etc/compile_check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,18 @@ function compile_check {
# Change the directory to the compilecheck test directory.
cd ${COMPILE_CHECK_DIR}

# If the Go version is 1.15 or greater, then run "go mod tidy".
MACHINE_VERSION=`${GC} version | { read _ _ v _; echo ${v#go}; }`
if [ $(version $MACHINE_VERSION) -ge $(version 1.15) ]; then
go mod tidy
fi

# Test vendoring
go mod vendor
${GC} build -mod=vendor

rm -rf vendor

MACHINE_VERSION=`${GC} version | { read _ _ v _; echo ${v#go}; }`

# If the version is not 1.13, then run "go mod tidy"
if [ $(version $MACHINE_VERSION) -ge $(version 1.15) ]; then
go mod tidy
fi

# Check simple build.
${GC} build ./...

Expand Down

0 comments on commit a7360fa

Please sign in to comment.