diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9db14b9..1c9607a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,24 +15,27 @@ jobs: fail-fast: false matrix: go: - - 23 + - "1.24.12" runs-on: ubuntu-latest steps: - uses: actions/checkout@v6 - uses: actions/setup-go@v6 with: - go-version: 1.${{matrix.go}}.x - - name: Install golangci-lint - run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.3.0 - - name: Run lint checks on the source with go 1.${{matrix.go}}.x - run: make check + go-version: "${{ matrix.go }}" + - name: Run go vet + run: go vet ./... + - name: golangci-lint + uses: golangci/golangci-lint-action@v9 + with: + version: v2.9 + args: --build-tags=integration unit-tests: strategy: fail-fast: false matrix: go: - - 23 + - "1.24.12" runs-on: ubuntu-latest steps: - uses: actions/checkout@v6 @@ -40,12 +43,12 @@ jobs: fetch-depth: 2 - uses: actions/setup-go@v6 with: - go-version: 1.${{matrix.go}}.x - - name: Run unit tests on go 1.${{matrix.go}}.x + go-version: "${{matrix.go}}" + - name: Run unit tests on Go ${{matrix.go}} run: make test - - name: Send coverage to codecov.io for go v1.23.x - if: matrix.go == 23 + - name: Send coverage to codecov.io + if: ${{ matrix.go == '1.24.12' }} run: bash <(curl -s https://codecov.io/bash) govulncheck: @@ -54,7 +57,7 @@ jobs: - uses: actions/checkout@v6 - uses: actions/setup-go@v6 with: - go-version: 1.23.x + go-version: "1.24.12" - name: Install govulncheck run: go install golang.org/x/vuln/cmd/govulncheck@latest - name: Run govulncheck diff --git a/go.mod b/go.mod index f155766..4eae393 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/osbuild/weldr-client/v2 -go 1.22.6 +go 1.24.12 require ( github.com/BurntSushi/toml v1.6.0 diff --git a/tools/prepare-source.sh b/tools/prepare-source.sh index a04da5b..a8c5016 100755 --- a/tools/prepare-source.sh +++ b/tools/prepare-source.sh @@ -3,7 +3,7 @@ set -eux # Pin Go and toolbox versions at a reasonable version -go get go@1.22.6 toolchain@1.22.6 +go get go@1.24.12 toolchain@1.24.12 # Update go.mod and go.sum: go mod tidy