Skip to content

Commit aa3a18b

Browse files
authored
Update to go 1.23 (#180)
* Update project to go 1.23 Signed-off-by: David Kwon <dakwon@redhat.com> * Retrieve digest with skopeo This is because when podman inspect is used to get the digest, the digest of the local build is being used instead of the digest defined in the image registry. Signed-off-by: David Kwon <dakwon@redhat.com> * Bump go version in PR check job to 1.23.6 Signed-off-by: David Kwon <dakwon@redhat.com> --------- Signed-off-by: David Kwon <dakwon@redhat.com>
1 parent 724c50b commit aa3a18b

File tree

5 files changed

+7
-4
lines changed

5 files changed

+7
-4
lines changed

.github/workflows/pr-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
name: Set up Go 1.x
2323
uses: actions/setup-go@v2
2424
with:
25-
go-version: 1.21.13
25+
go-version: 1.23.6
2626
-
2727
name: Check out code into the Go module directory
2828
uses: actions/checkout@v4

build/dockerfiles/controller.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#
1111

1212
# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi9/go-toolset
13-
FROM registry.access.redhat.com/ubi9/go-toolset:1.21.13-2.1727893526 AS builder
13+
FROM registry.access.redhat.com/ubi9/go-toolset:1.23.6-1745328278 AS builder
1414
ENV GOPATH=/go/
1515
USER root
1616

build/scripts/build_index_image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ $PODMAN build -f ./build/dockerfiles/Dockerfile -t "$BUNDLE_IMAGE" .
6262
$PODMAN push "$BUNDLE_IMAGE"
6363

6464
# Get digest for bundle image we just built
65-
BUNDLE_DIGEST=$($PODMAN inspect "$BUNDLE_IMAGE" | jq ".[].RepoDigests[0]" -r)
65+
BUNDLE_DIGEST=$(skopeo inspect "docker://$BUNDLE_IMAGE" | jq '"\(.Name)@\(.Digest)"' -r)
6666
echo "Using bundle $BUNDLE_DIGEST in index"
6767

6868
set -x

go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/redhat-developer/web-terminal-operator
22

3-
go 1.20
3+
go 1.23
4+
5+
toolchain go1.23.0
46

57
require (
68
github.com/devfile/api/v2 v2.2.0

go.sum

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -604,6 +604,7 @@ golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4f
604604
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
605605
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
606606
golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
607+
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
607608
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
608609
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
609610
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

0 commit comments

Comments
 (0)