Skip to content

Commit

Permalink
Update deps, add healthz (#38)
Browse files Browse the repository at this point in the history
Update all deps, move to latest go. Add a healthz endpoint. Update CI builds to
follow latest too.
  • Loading branch information
lstoll committed Mar 17, 2024
1 parent 3182202 commit 793ba03
Show file tree
Hide file tree
Showing 6 changed files with 136 additions and 171 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Docker meta
id: meta
Expand Down
20 changes: 11 additions & 9 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,25 @@ jobs:

build:
name: Build
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:

- name: Set up Go 1.19
uses: actions/setup-go@v1
with:
go-version: 1.19
id: go

- name: Install dependencies
run: sudo apt-get update && sudo apt-get install -y libsqlite3-dev libspatialite-dev

- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: stable
id: go

- name: Check out code into the Go module directory
uses: actions/checkout@v1
uses: actions/checkout@v4

- name: Test
run: go test ./...

- name: golangci-lint
uses: golangci/golangci-lint-action@v3
uses: golangci/golangci-lint-action@v4
with:
version: latest
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.19-bullseye AS build
FROM golang:1-bookworm AS build

WORKDIR /src

Expand All @@ -11,7 +11,7 @@ RUN go mod download
COPY . .
RUN go install ./...

FROM debian:bullseye
FROM debian:bookworm

WORKDIR /app

Expand Down
48 changes: 22 additions & 26 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,36 +1,32 @@
module github.com/lstoll/wherewasi

go 1.19
go 1.22

require (
github.com/ancientlore/go-tripit v0.2.1
github.com/cenkalti/backoff/v4 v4.0.2
github.com/google/uuid v1.1.1
github.com/mattn/go-sqlite3 v1.14.16
github.com/ancientlore/go-tripit v0.2.6
github.com/cenkalti/backoff/v4 v4.2.1
github.com/google/uuid v1.6.0
github.com/mattn/go-sqlite3 v1.14.22
github.com/oklog/run v1.1.0
github.com/pardot/oidc v0.0.0-20200518180338-f8645300dfbf
github.com/paulmach/go.geojson v1.4.0
github.com/prometheus/client_golang v1.7.1
golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
github.com/pardot/oidc v1.0.0
github.com/paulmach/go.geojson v1.5.0
github.com/prometheus/client_golang v1.19.0
golang.org/x/crypto v0.21.0
golang.org/x/oauth2 v0.18.0
)

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/golang/protobuf v1.4.2 // indirect
github.com/google/go-cmp v0.4.1 // indirect
github.com/gorilla/securecookie v1.1.1 // indirect
github.com/gorilla/sessions v1.2.0 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.10.0 // indirect
github.com/prometheus/procfs v0.1.3 // indirect
golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 // indirect
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
google.golang.org/appengine v1.4.0 // indirect
google.golang.org/protobuf v1.23.0 // indirect
gopkg.in/square/go-jose.v2 v2.4.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/gorilla/securecookie v1.1.2 // indirect
github.com/gorilla/sessions v1.2.2 // indirect
github.com/prometheus/client_model v0.6.0 // indirect
github.com/prometheus/common v0.50.0 // indirect
github.com/prometheus/procfs v0.13.0 // indirect
golang.org/x/sys v0.18.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/protobuf v1.33.0 // indirect
)

replace github.com/ancientlore/go-tripit => github.com/lstoll/go-tripit v0.2.2-0.20200627233105-39026d3d6e63 // lstoll-integ
Loading

0 comments on commit 793ba03

Please sign in to comment.