Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to golang 1.20.6 #4013

Merged
merged 1 commit into from
Jul 28, 2023
Merged

Update to golang 1.20.6 #4013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/checkLicenses.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Set up Go 1.20
uses: actions/setup-go@v3
with:
go-version: '>=1.20.5'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We might be able to use 'stable' here (for things where we are running go but not necessarily building artifacts): https://github.com/actions/setup-go#using-stableoldstable-aliases. But OTOH that might be more confusing than just having one, explicitly specified version.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I agree. But we have had quite a few CVE's come up about go, so on the other hand it is useful to be explicit about which version we are using.

go-version: '>=1.20.6'
- run: |
./scripts/create-licenses.sh
# Upload the licenses list so it's available if needed
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2eEnvironment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: '>=1.20.5'
go-version: '>=1.20.6'
- uses: actions/checkout@v3
# Pinned to Commit to ensure action is consistent: https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions
# If you upgrade this version confirm the changes match your expectations
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/go.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
- name: Set up Go 1.20
uses: actions/setup-go@v3
with:
go-version: '>=1.20.5'
go-version: '>=1.20.6'
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@v3
Expand All @@ -70,7 +70,7 @@ jobs:
- name: Set up Go 1.20
uses: actions/setup-go@v3
with:
go-version: '>=1.20.5'
go-version: '>=1.20.6'
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@v3
Expand All @@ -88,7 +88,7 @@ jobs:
# - name: Set up Go 1.20
# uses: actions/setup-go@v1
# with:
# go-version: '>=1.20.5'
# go-version: '>=1.20.6'
# id: go
# - name: Check out code into the Go module directory
# uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/live-e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: '>=1.20.5'
go-version: '>=1.20.6'
- uses: actions/checkout@master
# Pinned to Commit to ensure action is consistent: https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions
# If you upgrade this version confirm the changes match your expectations
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/porch-e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
- name: Set up Go 1.20
uses: actions/setup-go@v3
with:
go-version: '>=1.20.5'
go-version: '>=1.20.6'
- name: Checkout Porch
uses: actions/checkout@v3
- name: Build kpt
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/porch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Set up Go 1.20
uses: actions/setup-go@v3
with:
go-version: '>=1.20.5'
go-version: '>=1.20.6'
- name: Run Porch Unit Tests
uses: actions/checkout@v3
- name: Verify format / headers etc
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: '>=1.20.5'
go-version: '>=1.20.6'
- name: Checkout
uses: actions/checkout@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verifyContent.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: '>=1.20.5'
go-version: '>=1.20.6'
- uses: actions/checkout@v3
- run: |
make build
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

GOLANG_VERSION := 1.20.5
GOLANG_VERSION := 1.20.6
GORELEASER_CONFIG = release/tag/goreleaser.yaml
GORELEASER_IMAGE := ghcr.io/goreleaser/goreleaser-cross:v$(GOLANG_VERSION)

Expand Down
2 changes: 1 addition & 1 deletion porch/build/Dockerfile.apiserver
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM golang:1.20.5-bullseye as builder
FROM golang:1.20.6-bullseye as builder

WORKDIR /workspace/src
RUN git clone https://github.com/kubernetes/kubernetes --branch v1.23.2 --depth=1
Expand Down
2 changes: 1 addition & 1 deletion porch/build/Dockerfile.etcd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM golang:1.20.5-bullseye as builder
FROM golang:1.20.6-bullseye as builder

WORKDIR /workspace
ARG ETCD_VER=v3.5.1
Expand Down
2 changes: 1 addition & 1 deletion porch/build/Dockerfile.porch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.


FROM golang:1.20.5-bullseye as builder
FROM golang:1.20.6-bullseye as builder

WORKDIR /go/src/github.com/GoogleContainerTools/kpt

Expand Down
2 changes: 1 addition & 1 deletion porch/controllers/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM golang:1.20-bullseye as builder
FROM golang:1.20.6-bullseye as builder

WORKDIR /workspace
COPY go.mod go.sum ./
Expand Down
2 changes: 1 addition & 1 deletion porch/examples/apps/hello-server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM golang:1.20.5-bullseye as builder
FROM golang:1.20.6-bullseye as builder

WORKDIR /src
COPY go.mod go.sum ./
Expand Down
2 changes: 1 addition & 1 deletion porch/func/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ FROM gcr.io/kpt-fn/set-project-id:v0.2.0 as set-project-id
FROM gcr.io/kpt-fn/starlark:v0.3.0 as starlark
FROM gcr.io/kpt-fn/upsert-resource:v0.2.0 as upsert-resource

FROM golang:1.20.5-alpine3.18 as builder
FROM golang:1.20.6-alpine3.18 as builder
WORKDIR /go/src/github.com/GoogleContainerTools/kpt

RUN go install github.com/grpc-ecosystem/grpc-health-probe@v0.4.11
Expand Down
2 changes: 1 addition & 1 deletion porch/func/Dockerfile-wrapperserver
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.5-alpine3.18 as builder
FROM golang:1.20.6-alpine3.18 as builder

WORKDIR /go/src/github.com/GoogleContainerTools/kpt

Expand Down
2 changes: 1 addition & 1 deletion porch/test/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.


FROM golang:1.20.5-bullseye as builder
FROM golang:1.20.6-bullseye as builder

WORKDIR /go/src/github.com/GoogleContainerTools/kpt

Expand Down