diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 077863b..4cec680 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,13 +8,9 @@ jobs: fail-fast: false # perform matrix testing to give us an earlier insight into issues with different versions of supported major versions of Go matrix: - # strategy is used to allow us to pin to a specific Go version, or use the version available in our `go.mod` - strategy: ['go-version'] - version: [1.21] - include: - # pick up the Go version from the `go.mod` - - strategy: 'go-version-file' - version: 'go.mod' + version: + - "1.20" + - "1.21" steps: - name: Check out source code uses: actions/checkout@v3 @@ -22,7 +18,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - ${{ matrix.strategy }}: ${{ matrix.version }} + go-version: ${{ matrix.version }} - name: Test run: make test diff --git a/.github/workflows/generate.yml b/.github/workflows/generate.yml index 0d49502..4b1619e 100644 --- a/.github/workflows/generate.yml +++ b/.github/workflows/generate.yml @@ -8,13 +8,9 @@ jobs: fail-fast: false # perform matrix testing to give us an earlier insight into issues with different versions of supported major versions of Go matrix: - # strategy is used to allow us to pin to a specific Go version, or use the version available in our `go.mod` - strategy: ['go-version'] - version: [1.21] - include: - # pick up the Go version from the `go.mod` - - strategy: 'go-version-file' - version: 'go.mod' + version: + - "1.20" + - "1.21" steps: - name: Check out source code uses: actions/checkout@v3 @@ -22,7 +18,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - ${{ matrix.strategy }}: ${{ matrix.version }} + go-version: ${{ matrix.version }} - name: Run `make generate` run: make generate diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 816093d..1756e48 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -8,13 +8,9 @@ jobs: fail-fast: false # perform matrix testing to give us an earlier insight into issues with different versions of supported major versions of Go matrix: - # strategy is used to allow us to pin to a specific Go version, or use the version available in our `go.mod` - strategy: ['go-version'] - version: [1.21] - include: - # pick up the Go version from the `go.mod` - - strategy: 'go-version-file' - version: 'go.mod' + version: + - "1.20" + - "1.21" steps: - name: Check out source code uses: actions/checkout@v3 @@ -22,7 +18,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - ${{ matrix.strategy }}: ${{ matrix.version }} + go-version: ${{ matrix.version }} - name: Run `make lint-ci` run: make lint-ci diff --git a/.github/workflows/tidy.yml b/.github/workflows/tidy.yml index 6cda48d..eee49f8 100644 --- a/.github/workflows/tidy.yml +++ b/.github/workflows/tidy.yml @@ -8,13 +8,9 @@ jobs: fail-fast: false # perform matrix testing to give us an earlier insight into issues with different versions of supported major versions of Go matrix: - # strategy is used to allow us to pin to a specific Go version, or use the version available in our `go.mod` - strategy: ['go-version'] - version: [1.21] - include: - # pick up the Go version from the `go.mod` - - strategy: 'go-version-file' - version: 'go.mod' + version: + - "1.20" + - "1.21" steps: - name: Check out source code uses: actions/checkout@v3 @@ -22,7 +18,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - ${{ matrix.strategy }}: ${{ matrix.version }} + go-version: ${{ matrix.version }} - name: Install `tidied` run: go install gitlab.com/jamietanna/tidied@latest