diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 31b4661..bda7d4d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,29 +9,21 @@ jobs: name: Build runs-on: ubuntu-latest steps: - - name: Set up Go 1.22 + - name: Set up Go 1.24 uses: actions/setup-go@v5 with: - go-version: 1.22 + go-version: 1.24 - name: Check out code into the Go module directory uses: actions/checkout@v4 - - name: Lint, test and build + - name: Lint + run: make lint + - name: Format + run: make format && git diff --exit-code + - name: Test + run: make test + - name: Build run: | - # Install staticcheck for linting - go install honnef.co/go/tools/cmd/staticcheck@2023.1 - - # Lint and format - make lint - make format - - # Exit if after formatting there are any code differences - git diff --exit-code - - # Run tests - make test - - # Build and package if [ ${{ github.event_name }} == "release" ]; then VERSION="${{ github.event.release.tag_name }}" else diff --git a/CHANGELOG.md b/CHANGELOG.md index 37b928f..4e36f15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Changed +- Updated to Go 1.24 +- Updated dependencies to resolve security vulnerabilities ## [v1.3.0] - 2024-10-26 ### Added diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e610f5b..c725590 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -134,7 +134,7 @@ the other projects that solved it better and which could serve as inspiration. Developing this project requires these dependencies: -* [Go](https://golang.org/doc/install) >= `1.22` +* [Go](https://golang.org/doc/install) >= `1.24` * [Static Check](https://github.com/dominikh/go-tools) == `2023.1 (v0.4.0)` ### Commands diff --git a/Makefile b/Makefile index c7cc78b..9a4d303 100644 --- a/Makefile +++ b/Makefile @@ -48,7 +48,7 @@ zip: lint: @echo "=============Linting=============" - staticcheck ./... + go run honnef.co/go/tools/cmd/staticcheck@v0.6.0 ./... format: @echo "=============Formatting=============" diff --git a/go.mod b/go.mod index e053a19..7eba4ac 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/jthomperoo/simple-proxy -go 1.22 +go 1.24.0 require ( - github.com/golang/glog v1.0.0 - golang.org/x/net v0.30.0 + github.com/golang/glog v1.2.5 + golang.org/x/net v0.41.0 ) diff --git a/go.sum b/go.sum index a53831f..8deb664 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,6 @@ -github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ= -github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= -golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= -golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= +github.com/golang/glog v1.2.5 h1:DrW6hGnjIhtvhOIiAKT6Psh/Kd/ldepEa81DKeiRJ5I= +github.com/golang/glog v1.2.5/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw= +golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=