diff --git a/.circleci/config.yml b/.circleci/config.yml index c17c1cd3ea..02c01de6e7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: e2e: docker: - - image: cimg/go:1.21 # If you update this, update it in the Makefile too + - image: cimg/go:1.22 # If you update this, update it in the Makefile too environment: # This version of TF will be downloaded before Atlantis is started. # We do this instead of setting --default-tf-version because setting diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 3d60559b66..0bbf5b4b04 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -40,11 +40,17 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 + + # need to setup go toolchain explicitly + - uses: actions/setup-go@v5 + with: + go-version-file: go.mod + - name: golangci-lint uses: reviewdog/action-golangci-lint@v2 with: tool_name: golangci-lint - + skip-lint: needs: [changes] if: needs.changes.outputs.should-run-linting == 'false' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 60ac2a93d4..479e404f69 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,13 +11,11 @@ jobs: goreleaser: runs-on: ubuntu-22.04 steps: - - name: Checkout - uses: actions/checkout@v4 + - uses: actions/checkout@v4 with: submodules: true - - name: Set up Go - uses: actions/setup-go@v5 + - uses: actions/setup-go@v5 with: go-version-file: go.mod diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 403debc129..034b91c10b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -43,6 +43,12 @@ jobs: container: ghcr.io/runatlantis/testing-env:latest steps: - uses: actions/checkout@v4 + + # need to setup go toolchain explicitly + - uses: actions/setup-go@v5 + with: + go-version-file: go.mod + - run: make test-all - run: make check-fmt ########################################################### diff --git a/Dockerfile b/Dockerfile index c8db55a268..669f6c2551 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ARG DEFAULT_CONFTEST_VERSION=0.46.0 # Stage 1: build artifact and download deps -FROM golang:1.21.7-alpine AS builder +FROM golang:1.22.0-alpine AS builder ARG ATLANTIS_VERSION=dev ENV ATLANTIS_VERSION=${ATLANTIS_VERSION} diff --git a/e2e/go.mod b/e2e/go.mod index 47af467a2d..d43c435acd 100644 --- a/e2e/go.mod +++ b/e2e/go.mod @@ -1,6 +1,6 @@ module github.com/runatlantis/atlantis/e2e -go 1.21 +go 1.22 require ( github.com/google/go-github/v58 v58.0.0 diff --git a/go.mod b/go.mod index 6791c6b777..f37e696e29 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/runatlantis/atlantis -go 1.21 +go 1.22 require ( github.com/Masterminds/sprig/v3 v3.2.3 diff --git a/testing/Dockerfile b/testing/Dockerfile index e1b16cbb9e..935826e149 100644 --- a/testing/Dockerfile +++ b/testing/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.7 +FROM golang:1.22.0 RUN apt-get update && apt-get --no-install-recommends -y install unzip \ && apt-get clean \