Skip to content

Commit

Permalink
Upgrade infrastructure to Go 1.18 without requiring it (evcc-io#2976)
Browse files Browse the repository at this point in the history
  • Loading branch information
andig authored Mar 23, 2022
1 parent 515cd5f commit b65f05e
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: ^1.17
go-version: ^1.18
id: go

- name: Set up Node
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: ^1.17
go-version: ^1.18
id: go

- name: Set up Node
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: ^1.17
go-version: ^1.18
id: go

- name: Setup Node
Expand Down
2 changes: 2 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
run:
go: 1.18
issues:
exclude:
- .regActualCurrent. is unused
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN make clean ui


# STEP 2 build executable binary
FROM golang:1.17-alpine as builder
FROM golang:1.18-alpine as builder

# Install git + SSL ca certificates.
# Git is required for fetching the dependencies.
Expand Down
4 changes: 1 addition & 3 deletions docker/ci.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
# executes binary build excluding UI

# STEP 2 build executable binary
FROM golang:1.17-alpine as builder

# define RELEASE=1 to hide commit hash
ARG RELEASE={{ env "RELEASE" }}
FROM golang:1.18-alpine as builder

WORKDIR /build

Expand Down
2 changes: 1 addition & 1 deletion docker/tmpl.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ RUN make clean ui


# STEP 2 build executable binary
FROM golang:1.17-alpine as builder

# define RELEASE=1 to hide commit hash
ARG RELEASE={{ env "RELEASE" }}
FROM golang:1.18-alpine as builder

# Install git + SSL ca certificates.
# Git is required for fetching the dependencies.
Expand Down

0 comments on commit b65f05e

Please sign in to comment.