From 061114d9bf0c092c7b4d07be4b2f9ef69697f2e8 Mon Sep 17 00:00:00 2001 From: Lucas Yoon Date: Mon, 4 Aug 2025 17:14:36 -0400 Subject: [PATCH 1/2] updating go version to 1.24 Signed-off-by: Lucas Yoon --- .ci/Dockerfile | 2 +- .ci/Dockerfile.offline | 2 +- .ci/openshift_integration.sh | 4 ++-- .devfile.yaml | 2 +- .github/workflows/ci.yaml | 2 +- .github/workflows/pushimge-next.yaml | 2 +- .github/workflows/validate-samples.yaml | 2 +- .github/workflows/validate-stacks.yaml | 4 ++-- README.md | 2 +- tests/check_non_terminating/go.mod | 2 +- tests/odov3/go.mod | 2 +- tests/validate_devfile_schemas/go.mod | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.ci/Dockerfile b/.ci/Dockerfile index 8c4eb276..f543f93d 100644 --- a/.ci/Dockerfile +++ b/.ci/Dockerfile @@ -14,7 +14,7 @@ # limitations under the License. ARG BASE_IMAGE=quay.io/devfile/devfile-index-base:next -FROM registry.access.redhat.com/ubi8/go-toolset:1.23 AS builder +FROM registry.access.redhat.com/ubi8/go-toolset:1.24.4-1754328509 AS builder # Set user as root USER root diff --git a/.ci/Dockerfile.offline b/.ci/Dockerfile.offline index cc6cfc2e..d49e2968 100644 --- a/.ci/Dockerfile.offline +++ b/.ci/Dockerfile.offline @@ -14,7 +14,7 @@ # limitations under the License. ARG BASE_IMAGE=quay.io/devfile/devfile-index-base:next -FROM registry.access.redhat.com/ubi8/go-toolset:1.23 AS builder +FROM registry.access.redhat.com/ubi8/go-toolset:1.24.4-1754328509 AS builder # Set user as root USER root diff --git a/.ci/openshift_integration.sh b/.ci/openshift_integration.sh index ee3c0fc6..eeb607ca 100755 --- a/.ci/openshift_integration.sh +++ b/.ci/openshift_integration.sh @@ -51,8 +51,8 @@ curl -sL https://developers.redhat.com/content-gateway/rest/mirror/pub/openshift export GLOBALODOCONFIG=$(pwd)/preferences.yaml # Download & Install Ginkgo -GINKGO_VERSION="$(cd $BASE_DIR/tests/odov3 && go list -m -mod=readonly -json all | ${YQ_PATH} 'select(.Path == "github.com/onsi/ginkgo/v2") | .Version' -Mr -p=json)" -go install -mod=readonly github.com/onsi/ginkgo/v2/ginkgo@${GINKGO_VERSION} +GINKGO_VERSION=${GINKGO_VERSION:-v2.13.0} +go install github.com/onsi/ginkgo/v2/ginkgo@${GINKGO_VERSION} # Install the devfile registry oc process -f $BASE_DIR/.ci/deploy/devfile-registry.yaml -p DEVFILE_INDEX_IMAGE=$IMG -p IMAGE_TAG=$TAG -p REPLICAS=3 -p ANALYTICS_WRITE_KEY= | \ diff --git a/.devfile.yaml b/.devfile.yaml index 74b69e6a..39f7c50e 100644 --- a/.devfile.yaml +++ b/.devfile.yaml @@ -43,7 +43,7 @@ components: # Alternatively could be removed once https://github.com/redhat-developer/odo/issues/7162 is resolved - name: index-generator container: - image: registry.access.redhat.com/ubi8/go-toolset:1.23.6-4 + image: registry.access.redhat.com/ubi8/go-toolset:1.24.4-1754328509 # Devfile Registry Deployment resource - name: devfile-registry-deployment kubernetes: diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0ea5f161..58070546 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -36,7 +36,7 @@ jobs: - name: Setup Go environment uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0 with: - go-version: 1.23 + go-version: 1.24 - name: Set up QEMU # Enables arm64 image building uses: docker/setup-qemu-action@8b562efa09ec1557a9e26f25a7c6292838acea94 diff --git a/.github/workflows/pushimge-next.yaml b/.github/workflows/pushimge-next.yaml index 34d5729d..ddab2a76 100644 --- a/.github/workflows/pushimge-next.yaml +++ b/.github/workflows/pushimge-next.yaml @@ -41,7 +41,7 @@ jobs: - name: Setup Go environment uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0 with: - go-version: 1.23 + go-version: 1.24 - name: Set up QEMU # Enables arm64 image building uses: docker/setup-qemu-action@8b562efa09ec1557a9e26f25a7c6292838acea94 - name: Login to Quay diff --git a/.github/workflows/validate-samples.yaml b/.github/workflows/validate-samples.yaml index b8a2c2db..0146e3db 100644 --- a/.github/workflows/validate-samples.yaml +++ b/.github/workflows/validate-samples.yaml @@ -44,7 +44,7 @@ jobs: - name: Install Go uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0 with: - go-version: "1.23" + go-version: "1.24" - name: Install Ginkgo run: go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo@v2.13.0 diff --git a/.github/workflows/validate-stacks.yaml b/.github/workflows/validate-stacks.yaml index 3726ed1e..1e97f276 100644 --- a/.github/workflows/validate-stacks.yaml +++ b/.github/workflows/validate-stacks.yaml @@ -46,7 +46,7 @@ jobs: - name: Install Go uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0 with: - go-version: "1.23" + go-version: "1.24" - name: Install Ginkgo run: go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo@v2.13.0 @@ -163,7 +163,7 @@ jobs: - name: Install Go uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0 with: - go-version: "1.23" + go-version: "1.24" - name: Install odo latest version v3 uses: redhat-actions/openshift-tools-installer@2de9a80cf012ad0601021515481d433b91ef8fd5 # v1 diff --git a/README.md b/README.md index 94ef245f..c9732884 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ The public registry is updated weekly, by 12pm EST Wednesdays, with any updated ## Registry Status -![Go](https://img.shields.io/badge/Go-1.23-blue) +![Go](https://img.shields.io/badge/Go-1.24-blue) [![Validate Devfile stacks](https://github.com/devfile/registry/actions/workflows/validate-stacks.yaml/badge.svg?event=schedule)](https://github.com/devfile/registry/actions/workflows/validate-stacks.yaml) [![Renovate][1]][2] diff --git a/tests/check_non_terminating/go.mod b/tests/check_non_terminating/go.mod index e0cc8dc1..0c0e7af4 100644 --- a/tests/check_non_terminating/go.mod +++ b/tests/check_non_terminating/go.mod @@ -1,6 +1,6 @@ module github.com/devfile/registry/tests/check_non_terminating -go 1.23 +go 1.24 require github.com/devfile/library/v2 v2.3.0 diff --git a/tests/odov3/go.mod b/tests/odov3/go.mod index 176af8f4..52d313c7 100644 --- a/tests/odov3/go.mod +++ b/tests/odov3/go.mod @@ -1,6 +1,6 @@ module github.com/devfile/registry/tests/odov3 -go 1.23 +go 1.24 require ( github.com/devfile/api/v2 v2.3.0 diff --git a/tests/validate_devfile_schemas/go.mod b/tests/validate_devfile_schemas/go.mod index 14166ee6..4f0cc4a8 100644 --- a/tests/validate_devfile_schemas/go.mod +++ b/tests/validate_devfile_schemas/go.mod @@ -1,6 +1,6 @@ module github.com/devfile/registry/tests/validate_devfiles -go 1.23 +go 1.24 require ( github.com/devfile/library/v2 v2.3.0 From bdbfeef90e8ea2fb347a5b6c875a202369f541b6 Mon Sep 17 00:00:00 2001 From: Lucas Yoon Date: Tue, 12 Aug 2025 10:56:26 -0400 Subject: [PATCH 2/2] Fix breaking yq install Signed-off-by: Lucas Yoon --- .ci/Dockerfile | 2 +- .ci/Dockerfile.offline | 2 +- .ci/openshift_integration.sh | 4 ++-- extraDevfileEntries.yaml | 2 +- stacks/dotnet50/devfile.yaml | 2 +- stacks/dotnet60/devfile.yaml | 2 +- stacks/dotnet80/devfile.yaml | 2 +- stacks/dotnetcore31/devfile.yaml | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.ci/Dockerfile b/.ci/Dockerfile index f543f93d..3b28d5bd 100644 --- a/.ci/Dockerfile +++ b/.ci/Dockerfile @@ -25,7 +25,7 @@ ARG TARGETARCH=amd64 # Install yq and jq ENV YQ_VERSION=v4.44.1 ENV JQ_VERSION=1.6 -RUN curl -sL -O https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_${TARGETARCH} -o /usr/local/bin/yq && mv ./yq_linux_${TARGETARCH} /usr/local/bin/yq && chmod +x /usr/local/bin/yq +RUN curl -sL https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_${TARGETARCH} -o /usr/local/bin/yq && chmod +x /usr/local/bin/yq RUN yum install -y jq-${JQ_VERSION} COPY . /registry diff --git a/.ci/Dockerfile.offline b/.ci/Dockerfile.offline index d49e2968..ae39e869 100644 --- a/.ci/Dockerfile.offline +++ b/.ci/Dockerfile.offline @@ -25,7 +25,7 @@ ARG TARGETARCH=amd64 # Install yq and jq ENV YQ_VERSION=v4.44.1 ENV JQ_VERSION=1.6 -RUN curl -sL -O https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_${TARGETARCH} -o /usr/local/bin/yq && mv ./yq_linux_${TARGETARCH} /usr/local/bin/yq && chmod +x /usr/local/bin/yq +RUN curl -sL https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_${TARGETARCH} -o /usr/local/bin/yq && chmod +x /usr/local/bin/yq RUN yum install -y jq-${JQ_VERSION} COPY . /registry diff --git a/.ci/openshift_integration.sh b/.ci/openshift_integration.sh index eeb607ca..ee3c0fc6 100755 --- a/.ci/openshift_integration.sh +++ b/.ci/openshift_integration.sh @@ -51,8 +51,8 @@ curl -sL https://developers.redhat.com/content-gateway/rest/mirror/pub/openshift export GLOBALODOCONFIG=$(pwd)/preferences.yaml # Download & Install Ginkgo -GINKGO_VERSION=${GINKGO_VERSION:-v2.13.0} -go install github.com/onsi/ginkgo/v2/ginkgo@${GINKGO_VERSION} +GINKGO_VERSION="$(cd $BASE_DIR/tests/odov3 && go list -m -mod=readonly -json all | ${YQ_PATH} 'select(.Path == "github.com/onsi/ginkgo/v2") | .Version' -Mr -p=json)" +go install -mod=readonly github.com/onsi/ginkgo/v2/ginkgo@${GINKGO_VERSION} # Install the devfile registry oc process -f $BASE_DIR/.ci/deploy/devfile-registry.yaml -p DEVFILE_INDEX_IMAGE=$IMG -p IMAGE_TAG=$TAG -p REPLICAS=3 -p ANALYTICS_WRITE_KEY= | \ diff --git a/extraDevfileEntries.yaml b/extraDevfileEntries.yaml index a8832493..965034b4 100644 --- a/extraDevfileEntries.yaml +++ b/extraDevfileEntries.yaml @@ -111,7 +111,7 @@ samples: - name: dotnet-basic displayName: Basic .NET description: MVC .NET 6.0 application - icon: https://github.com/dotnet/brand/raw/main/logo/dotnet-logo.png + icon: https://raw.githubusercontent.com/dotnet/brand/main/logo/dotnet-logo.png tags: - .NET projectType: dotnet diff --git a/stacks/dotnet50/devfile.yaml b/stacks/dotnet50/devfile.yaml index f690d40e..4c47b696 100644 --- a/stacks/dotnet50/devfile.yaml +++ b/stacks/dotnet50/devfile.yaml @@ -3,7 +3,7 @@ metadata: name: dotnet50 displayName: .NET 5.0 description: .NET 5.0 application - icon: https://github.com/dotnet/brand/raw/main/logo/dotnet-logo.png + icon: https://raw.githubusercontent.com/dotnet/brand/main/logo/dotnet-logo.png tags: - .NET - .NET 5.0 diff --git a/stacks/dotnet60/devfile.yaml b/stacks/dotnet60/devfile.yaml index e6e0bddb..3d2ea61c 100644 --- a/stacks/dotnet60/devfile.yaml +++ b/stacks/dotnet60/devfile.yaml @@ -3,7 +3,7 @@ metadata: name: dotnet60 displayName: .NET 6.0 description: .NET 6.0 application - icon: https://github.com/dotnet/brand/raw/main/logo/dotnet-logo.png + icon: https://raw.githubusercontent.com/dotnet/brand/main/logo/dotnet-logo.png tags: - .NET - .NET 6.0 diff --git a/stacks/dotnet80/devfile.yaml b/stacks/dotnet80/devfile.yaml index 95633088..9d3d2b13 100644 --- a/stacks/dotnet80/devfile.yaml +++ b/stacks/dotnet80/devfile.yaml @@ -3,7 +3,7 @@ metadata: name: dotnet80 displayName: .NET 8.0 description: .NET 8.0 application - icon: https://github.com/dotnet/brand/raw/main/logo/dotnet-logo.png + icon: https://raw.githubusercontent.com/dotnet/brand/main/logo/dotnet-logo.png tags: - .NET - .NET 8.0 diff --git a/stacks/dotnetcore31/devfile.yaml b/stacks/dotnetcore31/devfile.yaml index ad2a4ebe..fcbb1db4 100644 --- a/stacks/dotnetcore31/devfile.yaml +++ b/stacks/dotnetcore31/devfile.yaml @@ -3,7 +3,7 @@ metadata: name: dotnetcore31 displayName: .NET Core 3.1 description: .NET Core 3.1 application - icon: https://github.com/dotnet/brand/raw/main/logo/dotnet-logo.png + icon: https://raw.githubusercontent.com/dotnet/brand/main/logo/dotnet-logo.png tags: - .NET - .NET Core App 3.1