Skip to content

Commit

Permalink
Build with go v1.21 but only support go >= v1.19 (#24)
Browse files Browse the repository at this point in the history
* Build with go v1.21 but only support go >= v1.19

* Go mod tidy

---------

Co-authored-by: Alexandre Maldeme <alm@planday.com>
  • Loading branch information
lescactus and AlexandreMaldeme authored Dec 22, 2023
1 parent bfc6575 commit 2193474
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 349 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
build:
strategy:
matrix:
version: [1.15, 1.16, 1.17, 1.18, 1.19]
version: ["1.19", "1.20", "1.21"]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -30,7 +30,7 @@ jobs:
test:
strategy:
matrix:
version: [1.15, 1.16, 1.17, 1.18, 1.19]
version: ["1.19", "1.20", "1.21"]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -47,7 +47,7 @@ jobs:
race-condition:
strategy:
matrix:
version: [1.15, 1.16, 1.17, 1.18, 1.19]
version: ["1.19", "1.20", "1.21"]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ on:

permissions:
contents: write
# packages: write
# issues: write

jobs:
goreleaser:
Expand All @@ -27,16 +25,15 @@ jobs:
name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.16
go-version: 1.21
-
name: Run GoReleaser
uses: goreleaser/goreleaser-action@v5
with:
# either 'goreleaser' (default) or 'goreleaser-pro'
distribution: goreleaser
version: 1.6.0 # latest require go 1.18
args: release --rm-dist
version: latest # require go 1.18
args: release --clean
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# Your GoReleaser Pro key, if you are using the 'goreleaser-pro' distribution
# GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}

2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.16 as build-env
FROM golang:1.21 as build-env

ADD go.* /go/src/

Expand Down
41 changes: 39 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/lescactus/geolocation-go

go 1.16
go 1.19

require (
github.com/alicebob/miniredis/v2 v2.31.0
Expand All @@ -15,7 +15,44 @@ require (
github.com/rs/zerolog v1.26.1
github.com/slok/go-http-metrics v0.10.0
github.com/spf13/viper v1.12.0
github.com/stretchr/objx v0.3.0 // indirect
github.com/stretchr/testify v1.7.1
)

require (
github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/klauspost/compress v1.13.6 // indirect
github.com/magiconair/properties v1.8.6 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pelletier/go-toml/v2 v2.0.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/spf13/afero v1.8.2 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/objx v0.3.0 // indirect
github.com/subosito/gotenv v1.3.0 // indirect
github.com/vmihailenco/go-tinylfu v0.2.2 // indirect
github.com/vmihailenco/msgpack/v5 v5.3.4 // indirect
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
github.com/yuin/gopher-lua v1.1.0 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
golang.org/x/text v0.3.7 // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/ini.v1 v1.66.4 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0 // indirect
)
Loading

0 comments on commit 2193474

Please sign in to comment.