diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 24ab5c1..de452b3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,6 +36,7 @@ jobs: - '1.20' - '1.21' - '1.22' + - '1.23' os: - ubuntu-latest @@ -45,20 +46,13 @@ jobs: uses: actions/setup-go@v6 with: go-version: ${{ matrix.go_version }} + cache: true id: go - name: Checkout uses: actions/checkout@v4 - - name: Cache dependencies - uses: actions/cache@v4 - with: - path: | - ~/.cache/go-build - ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} - restore-keys: | - ${{ runner.os }}-go- + # Built-in caching in setup-go covers module and build caches - name: Merge code into the upstream if: ${{ github.event_name == 'pull_request' }} @@ -73,13 +67,13 @@ jobs: - name: Install dependencies run: | - go get -v -t -d ./... + go mod download # Removed code formatting enforcement to allow custom import style - name: Verify run: | - go mod tidy + if [[ "${{ matrix.go_version }}" == "1.20" ]]; then go mod tidy; fi make verify - name: Build diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 09de1cb..5467095 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -18,9 +18,7 @@ jobs: strategy: matrix: golang: - - "1.20" - - "1.21" - - "1.22" + - "1.23" steps: - uses: actions/setup-go@v6 with: diff --git a/.github/workflows/protoc-release.yml b/.github/workflows/protoc-release.yml index a20bbce..1a5a51c 100644 --- a/.github/workflows/protoc-release.yml +++ b/.github/workflows/protoc-release.yml @@ -24,6 +24,8 @@ jobs: - name: Set up Go uses: actions/setup-go@v6 + with: + go-version: '1.20.x' - name: Download dependencies run: |