Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 9 additions & 17 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]

# 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
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ zip:

lint:
@echo "=============Linting============="
staticcheck ./...
go run honnef.co/go/tools/cmd/staticcheck@v0.6.0 ./...

format:
@echo "=============Formatting============="
Expand Down
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -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
)
10 changes: 6 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
@@ -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=
Loading