diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ab05fafebe..c4e5498fbf 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,5 +17,5 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 - - uses: pre-commit/action@v3.0.0 + - uses: actions/setup-python@v5 + - uses: pre-commit/action@v3.0.1 diff --git a/etc/compile_check.sh b/etc/compile_check.sh index 3815d19f3a..397322f2bf 100755 --- a/etc/compile_check.sh +++ b/etc/compile_check.sh @@ -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 ./...