Skip to content

Commit

Permalink
Merge pull request #354 from xiaods/dev
Browse files Browse the repository at this point in the history
fix: clean go version validate logic
  • Loading branch information
xiaods authored Oct 21, 2024
2 parents 71a121d + d5e90a7 commit c76ca69
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/builder-arm64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: actions/checkout@master
- uses: actions/setup-go@v4
with:
go-version: '1.22.5'
go-version: '1.22'
cache-dependency-path: subdir/go.sum
- name: generate resources
run: mkdir -p {build/data,build/static}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: actions/checkout@master
- uses: actions/setup-go@v4
with:
go-version: '1.22.5'
go-version: '1.22'
cache-dependency-path: subdir/go.sum
- name: check depends
run: sudo apt-get install -y libseccomp-dev
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
ref: 'dev'
- uses: actions/setup-go@v4
with:
go-version: '1.22.5'
go-version: '1.22'
cache-dependency-path: subdir/go.sum
- name: generate resources
run: |
Expand Down
6 changes: 0 additions & 6 deletions hack/validate
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@ if [ -n "$DIRTY" ]; then
exit 1
fi

echo Running: go version
if ! go version | grep -s "go version ${VERSION_GOLANG} "; then
echo "Unexpected $(go version) - Kubernetes ${VERSION_K8S} should be built with go version ${VERSION_GOLANG}"
exit 1
fi

echo Running: go mod verify
go mod verify

Expand Down

0 comments on commit c76ca69

Please sign in to comment.