Skip to content

Commit

Permalink
using go 1.22, related #800 (#832)
Browse files Browse the repository at this point in the history
  • Loading branch information
malud authored Jul 9, 2024
1 parent f5ad824 commit 1d4b8f4
Show file tree
Hide file tree
Showing 21 changed files with 10 additions and 274 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docs-website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/[email protected]
with:
go-version: '1.21'
go-version: '1.22'
id: go
- run: go version

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/go-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/[email protected]
with:
go-version: '1.21'
go-version: '1.22'
- uses: actions/checkout@v4
- name: 'test & report'
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/[email protected]
with:
go-version: '1.21'
go-version: '1.22'
id: go
- run: go version

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
github_token: ${{ secrets.GITHUB_TOKEN }}
goos: ${{ matrix.goos }}
goarch: ${{ matrix.goarch }}
goversion: '1.21'
goversion: '1.22'
binary_name: 'couper'
ldflags: '-X ${{ env.VERSION_PACKAGE }}.VersionName=${{ github.ref_name }} -X ${{ env.VERSION_PACKAGE }}.BuildName=${{ steps.vars.outputs.sha_short }} -X ${{ env.VERSION_PACKAGE }}.BuildDate=${{ steps.vars.outputs.build_date }}'
sha256sum: true
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
- name: 'setup go'
uses: actions/[email protected]
with:
go-version: '1.21'
go-version: '1.22'

- name: Set GOARCH environment variable
run: echo "GOARCH=${{ matrix.goarch }}" >> $GITHUB_ENV
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/weekly-fuzz.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/[email protected]
with:
go-version: '1.21'
go-version: '1.22'
id: go
- run: go version

Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Unreleased changes are available as `coupergateway/couper:edge` container.
* Duplicate [CORS](https://docs.couper.io/configuration/block/cors) response headers (with backend sending CORS response headers, too) ([#804](https://github.com/coupergateway/couper/pull/804))

* **Dependencies**
* build with go 1.21 ([#800](https://github.com/coupergateway/couper/pull/800))
* build with go 1.22 ([#810](https://github.com/coupergateway/couper/pull/810))
* upgrade jwt library from v4 to v5 ([#769](https://github.com/coupergateway/couper/issues/769))

---
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21 AS builder
FROM golang:1.22 AS builder

WORKDIR /go/src/app
COPY . .
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.PHONY: docker-telemetry build generate image
.PHONY: test test-docker coverage test-coverage convert-test-coverage test-coverage-show

GO_VERSION := 1.21
GO_VERSION := 1.22

build:
go build -race -v -o couper main.go
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/coupergateway/couper

go 1.21
go 1.22

require (
github.com/docker/go-units v0.5.0
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 1d4b8f4

Please sign in to comment.