Skip to content

Commit

Permalink
Merge pull request #407 from roots/go-1.19
Browse files Browse the repository at this point in the history
Use Go 1.19
  • Loading branch information
swalkinshaw authored Aug 7, 2023
2 parents ce692fd + c46712a commit 37d8e09
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: 1.18
go-version: 1.19
- uses: actions/cache@v2
with:
path: |
Expand All @@ -35,7 +35,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-go@v2
with:
go-version: 1.18
go-version: 1.19
- name: Install GoReleaser
uses: goreleaser/goreleaser-action@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-go@v2
with:
go-version: 1.18
go-version: 1.19
- name: GoReleaser release
uses: goreleaser/goreleaser-action@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This docker image is for integration testing only.

FROM golang:1.18-bullseye
FROM golang:1.19-bullseye

ARG DEBIAN_FRONTEND=noninteractive

Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ RUN=$(DOCKER_RUN) $(DOCKER_NAME)

.PHONY: docker docker-no-cache
docker:
docker build -t $(DOCKER_NAME) .
docker build -t $(DOCKER_NAME) . --platform linux/amd64
docker-no-cache:
docker build -t $(DOCKER_NAME) --no-cache .
docker build -t $(DOCKER_NAME) --no-cache --platform linux/amd64 .

.PHONY: shell
shell:
$(RUN) bash

.PHONY: test
test:
$(RUN) sh -c 'go build -v -o $$TEST_BINARY && go test -v ./...'
$(RUN) sh -c 'go build -buildvcs=false -v -o $$TEST_BINARY && go test -v ./...'
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/roots/trellis-cli

go 1.18
go 1.19

require (
github.com/digitalocean/godo v1.83.0
Expand Down

0 comments on commit 37d8e09

Please sign in to comment.