From 5408f8297fed6b752219da9e4b428827c703a666 Mon Sep 17 00:00:00 2001 From: paul-fastly Date: Mon, 17 Mar 2025 17:26:16 -0400 Subject: [PATCH 1/6] Upgrade to Go 1.23 --- .github/workflows/build.yml | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b8926a1..5b96b93 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go: [ '1.18' ] + go: [ '1.23' ] name: Build ${{ matrix.go }} steps: - uses: aws-actions/configure-aws-credentials@v1-node16 diff --git a/go.mod b/go.mod index e9ae513..7f5929f 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/signalsciences/sigsci-module-golang -go 1.21 +go 1.23 require ( github.com/signalsciences/tlstext v1.2.0 From a36dfde3c9501c55ae67b0e955bd86eb4bbbb0d2 Mon Sep 17 00:00:00 2001 From: paul-fastly Date: Mon, 17 Mar 2025 17:28:07 -0400 Subject: [PATCH 2/6] Comment a function --- responsewriter.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/responsewriter.go b/responsewriter.go index 761a7c4..eb1ab25 100644 --- a/responsewriter.go +++ b/responsewriter.go @@ -81,6 +81,8 @@ func (w *responseRecorder) WriteHeader(status int) { w.base.WriteHeader(status) } +// Merge in our header modifications using the appropriate functions in +// the Header type in net/http func (w *responseRecorder) mergeHeader() { hdr := w.base.Header() for _, a := range w.actions { From 7612c5781561a84981c387c74af1887b9b386e9a Mon Sep 17 00:00:00 2001 From: paul-fastly Date: Mon, 17 Mar 2025 17:28:34 -0400 Subject: [PATCH 3/6] Use a docker image for running scripts/build.sh so it works on MacOS --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c966a87..f8b170c 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ build: ## build and lint locally - ./scripts/build.sh + docker run --rm -v "$(CURDIR):/temp" -w /temp golang:1.23 ./scripts/build.sh # clean up each time to make sure nothing is cached between runs # From b90afac0ec3159bff296573bc11cd12d962aa855 Mon Sep 17 00:00:00 2001 From: paul-fastly Date: Mon, 17 Mar 2025 17:29:02 -0400 Subject: [PATCH 4/6] Changelog & version --- CHANGELOG.md | 4 ++++ VERSION | 2 +- version.go | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2f5c69..d6a7643 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Golang Module Release Notes +## 1.14.1 2025-03-17 +* Upgrade to Go 1.23 +* Run `scripts/build.sh` in a Docker image (in `make build`) so that it works on MacOS. + ## 1.14.0 2024-11-18 * Allow the agent to edit application response headers diff --git a/VERSION b/VERSION index 850e742..63e799c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.14.0 +1.14.1 diff --git a/version.go b/version.go index cc99581..3beaeac 100644 --- a/version.go +++ b/version.go @@ -1,3 +1,3 @@ package sigsci -const version = "1.14.0" +const version = "1.14.1" From 660cdf98d3ea8319b1872b816644977a0e304108 Mon Sep 17 00:00:00 2001 From: paul-fastly Date: Mon, 17 Mar 2025 18:04:34 -0400 Subject: [PATCH 5/6] Undo the version bumpb --- .github/workflows/build.yml | 2 +- CHANGELOG.md | 1 - go.mod | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5b96b93..b8926a1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go: [ '1.23' ] + go: [ '1.18' ] name: Build ${{ matrix.go }} steps: - uses: aws-actions/configure-aws-credentials@v1-node16 diff --git a/CHANGELOG.md b/CHANGELOG.md index d6a7643..3850ac8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,6 @@ # Golang Module Release Notes ## 1.14.1 2025-03-17 -* Upgrade to Go 1.23 * Run `scripts/build.sh` in a Docker image (in `make build`) so that it works on MacOS. ## 1.14.0 2024-11-18 diff --git a/go.mod b/go.mod index 7f5929f..e9ae513 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/signalsciences/sigsci-module-golang -go 1.23 +go 1.21 require ( github.com/signalsciences/tlstext v1.2.0 From 9017e456d296d4120daa83facae0798644df4167 Mon Sep 17 00:00:00 2001 From: paul-fastly Date: Mon, 17 Mar 2025 18:09:27 -0400 Subject: [PATCH 6/6] I don't need to bump the version anymore --- VERSION | 2 +- version.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 63e799c..850e742 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.14.1 +1.14.0 diff --git a/version.go b/version.go index 3beaeac..cc99581 100644 --- a/version.go +++ b/version.go @@ -1,3 +1,3 @@ package sigsci -const version = "1.14.1" +const version = "1.14.0"