From 580853611156deb22950d04763b987336ef62737 Mon Sep 17 00:00:00 2001 From: Alexandre Perrin Date: Wed, 5 Jun 2024 15:28:06 +0200 Subject: [PATCH 1/2] ci: use main as default branch Signed-off-by: Alexandre Perrin --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8dd94310..d276425f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -3,7 +3,7 @@ on: pull_request: {} push: branches: - - master + - main - v0.1 jobs: build: From d2491a20f5c8416b1b3ffaf14e0d13c57423bc51 Mon Sep 17 00:00:00 2001 From: Alexandre Perrin Date: Wed, 5 Jun 2024 15:50:59 +0200 Subject: [PATCH 2/2] bump Golang to v1.22.4 Signed-off-by: Alexandre Perrin --- Dockerfile | 4 ++-- go.mod | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 14e859fd..8b06570d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ # (first line comment needed for DOCKER_BUILDKIT use) # # use skopeo inspect to get the multiarch manifest list digest -# skopeo inspect --override-os linux docker://golang:1.22.3-alpine3.19 | jq -r '.Digest' -ARG GOLANG_IMAGE=docker.io/library/golang:1.22.3-alpine3.19@sha256:2a882244fb51835ebbd8313bffee83775b0c076aaf56b497b43d8a4c72db65e1 +# skopeo inspect --override-os linux docker://golang:1.22.4-alpine3.19 | jq -r '.Digest' +ARG GOLANG_IMAGE=docker.io/library/golang:1.22.4-alpine3.19@sha256:65b5d2d0a312fd9ef65551ad7f9cb5db1f209b7517ef6d5625cfd29248bc6c85 ARG BASE_IMAGE=scratch FROM ${GOLANG_IMAGE} as builder diff --git a/go.mod b/go.mod index 94bea18a..e8a65c6a 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/cilium/certgen -go 1.22.3 +go 1.22.4 require ( github.com/cloudflare/cfssl v1.6.5