From 1ae431a8e3029b31ec4198f4a0970b3c53f8881f Mon Sep 17 00:00:00 2001 From: Jonathan West Date: Wed, 31 Jul 2024 07:03:36 -0400 Subject: [PATCH] Update to Go 1.21 (#38) Signed-off-by: Jonathan West --- .ci-operator.yaml | 2 +- .github/workflows/go.yml | 2 +- Dockerfile | 2 +- go.mod | 2 +- openshift-ci/build-root/Dockerfile | 4 +--- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 11779c0..af03e31 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: release namespace: openshift - tag: golang-1.20 \ No newline at end of file + tag: golang-1.21 \ No newline at end of file diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index b1e1b6d..c1695ca 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: '1.20' + go-version: '1.21' - name: Build run: go build -v ./... diff --git a/Dockerfile b/Dockerfile index 4c90aba..2299e0e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM openshift/origin-release:golang-1.20 AS build +FROM openshift/origin-release:golang-1.21 AS build WORKDIR /go/src COPY . /go/src RUN GIT_COMMIT=$(git rev-parse HEAD) && \ diff --git a/go.mod b/go.mod index 2b29aa4..82295a9 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/redhat-developer/gitops-backend -go 1.19 +go 1.21 require ( github.com/argoproj/argo-cd v0.8.1-0.20210326223336-719d6a9c252e diff --git a/openshift-ci/build-root/Dockerfile b/openshift-ci/build-root/Dockerfile index 75a60ac..422affc 100644 --- a/openshift-ci/build-root/Dockerfile +++ b/openshift-ci/build-root/Dockerfile @@ -1,5 +1,3 @@ # Dockerfile to bootstrap build and test in openshift-ci -FROM registry.ci.openshift.org/openshift/release:golang-1.20 - -RUN yum -y install dnf httpd-tools \ No newline at end of file +FROM registry.ci.openshift.org/openshift/release:golang-1.21