Skip to content

Commit

Permalink
Merge pull request #142 from bhandras/go-bump
Browse files Browse the repository at this point in the history
build: bump to go 1.22.3
  • Loading branch information
guggero authored Jul 12, 2024
2 parents f2f4ed2 + 5d22ef1 commit a308758
Show file tree
Hide file tree
Showing 6 changed files with 52 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ env:
# https://github.com/golang/go/issues/51799). There was a race condition
# introduced with go 1.16.10 that causes the unit tests to fail (could also
# happen in production).
GO_VERSION: 1.19.2
GO_VERSION: 1.22.3

jobs:
########################
Expand Down
14 changes: 5 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
# Don't bump this until go 1.19 is out (which should include a fix for
# https://github.com/golang/go/issues/51799). There was a race condition
# introduced with go 1.16.10 that causes the unit tests to fail (could also
# happen in production).
FROM golang:1.19.2-alpine as builder
FROM golang:1.22.3-alpine as builder

# Force Go to use the cgo based DNS resolver. This is required to ensure DNS
# queries required to connect to linked containers succeed.
Expand All @@ -17,10 +13,10 @@ ARG checkout="master"
RUN apk add --no-cache --update alpine-sdk \
git \
make \
&& git clone https://github.com/lightninglabs/aperture /go/src/github.com/lightninglabs/aperture \
&& cd /go/src/github.com/lightninglabs/aperture \
&& git checkout $checkout \
&& make install
&& git clone https://github.com/lightninglabs/aperture /go/src/github.com/lightninglabs/aperture \
&& cd /go/src/github.com/lightninglabs/aperture \
&& git checkout $checkout \
&& make install

# Start a new, final image to reduce size.
FROM alpine as final
Expand Down
4 changes: 3 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
module github.com/lightninglabs/aperture

go 1.19
go 1.22

toolchain go1.22.3

require (
github.com/btcsuite/btcd v0.24.1-0.20240123000108-62e6af035ec5
Expand Down
Loading

0 comments on commit a308758

Please sign in to comment.