diff --git a/.devfile.Dockerfile b/.devfile.Dockerfile index 4068f5140..6ae5ecdf9 100644 --- a/.devfile.Dockerfile +++ b/.devfile.Dockerfile @@ -1,9 +1,10 @@ FROM quay.io/devfile/universal-developer-image:ubi8-latest -RUN cd /tmp && wget https://go.dev/dl/go1.25.5.linux-amd64.tar.gz && \ - mkdir $HOME/go1.25.5 && \ - tar -xvzf go1.25.5.linux-amd64.tar.gz -C $HOME/go1.25.5 --strip-components 1 && \ - if ! grep -q "export PATH=\$HOME/go1.19/bin:\$PATH" $HOME/.bashrc; then echo "export PATH=\$HOME/go1.24.7/bin:\$PATH" >> $HOME/.bashrc; fi +ENV GO_VERSION=1.25.7 +RUN cd /tmp && wget https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz && \ + mkdir $HOME/go${GO_VERSION} && \ + tar -xvzf go${GO_VERSION}.linux-amd64.tar.gz -C $HOME/go${GO_VERSION} --strip-components 1 && \ + if ! grep -q "export PATH=\$HOME/go${GO_VERSION}/bin:\$PATH" $HOME/.bashrc; then echo "export PATH=\$HOME/go${GO_VERSION}/bin:\$PATH" >> $HOME/.bashrc; fi # install chectl RUN tag=$(curl https://api.github.com/repos/che-incubator/chectl/tags | jq -r '.[0].name') && \ @@ -13,4 +14,4 @@ RUN tag=$(curl https://api.github.com/repos/che-incubator/chectl/tags | jq -r '. if ! grep -q "export PATH=\$HOME/chectl/bin:\$PATH" $HOME/.bashrc; then echo "export PATH=\$HOME/chectl/bin:\$PATH" >> $HOME/.bashrc; fi # install goimports -RUN $HOME/go1.25.5/bin/go install golang.org/x/tools/cmd/goimports@latest +RUN $HOME/go${GO_VERSION}/bin/go install golang.org/x/tools/cmd/goimports@latest diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index a1c997d62..cd55fb081 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -24,10 +24,10 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - name: Set up Go 1.25.5 + - name: Set up Go 1.25.7 uses: actions/setup-go@v3 with: - go-version: 1.25.5 + go-version: 1.25.7 - name: Run unit tests run: make test - name: Build Codecov report diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index e05ba3dc7..97987463b 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -18,10 +18,10 @@ jobs: steps: - name: Checkout source code uses: actions/checkout@v4 - - name: Set up Go 1.25.5 + - name: Set up Go 1.25.7 uses: actions/setup-go@v3 with: - go-version: 1.25.5 + go-version: 1.25.7 - name: Run unit tests run: make test multiplatform-image-build: @@ -47,10 +47,10 @@ jobs: steps: - name: Checkout source code uses: actions/checkout@v4 - - name: Set up Go 1.25.5 + - name: Set up Go 1.25.7 uses: actions/setup-go@v3 with: - go-version: 1.25.5 + go-version: 1.25.7 - name: Cache go modules id: cache-mod uses: actions/cache@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 40174051d..ab03bbd96 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -72,10 +72,10 @@ jobs: sudo chmod +x /usr/local/bin/base32 #remove base32 from current directory to avoid it being commited during release rm $(pwd)/base32 - - name: Set up Go 1.25.5 + - name: Set up Go 1.25.7 uses: actions/setup-go@v3 with: - go-version: 1.25.5 + go-version: 1.25.7 - name: Release operator env: IMAGE_REGISTRY_HOST: quay.io diff --git a/.github/workflows/resources-check-main.yml b/.github/workflows/resources-check-main.yml index 951f78eb8..5a8c62660 100644 --- a/.github/workflows/resources-check-main.yml +++ b/.github/workflows/resources-check-main.yml @@ -23,10 +23,10 @@ jobs: uses: actions/checkout@v4 - name: Install yq run: sudo pip install yq - - name: Set up Go 1.25.5 + - name: Set up Go 1.25.7 uses: actions/setup-go@v3 with: - go-version: 1.25.5 + go-version: 1.25.7 - name: Validate operator resources run: | go install golang.org/x/tools/cmd/goimports@latest @@ -38,9 +38,9 @@ jobs: uses: actions/checkout@v4 - name: Install yq run: sudo pip install yq - - name: Set up Go 1.25.5 + - name: Set up Go 1.25.7 uses: actions/setup-go@v3 with: - go-version: 1.25.5 + go-version: 1.25.7 - name: Validate OLM bundle version run: ${GITHUB_WORKSPACE}/build/scripts/check-bundle-version.sh diff --git a/Dockerfile b/Dockerfile index ebb36c564..4c57b9f82 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ ARG SKIP_TESTS="false" USER root ### Start installing go -ENV GO_VERSION=1.25.5 +ENV GO_VERSION=1.25.7 ENV GOROOT=/usr/local/go ENV PATH=$PATH:$GOROOT/bin RUN dnf install unzip gcc -y diff --git a/go.mod b/go.mod index caa9286eb..ca2f32b7f 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/eclipse-che/che-operator -go 1.25.5 +go 1.25 require ( github.com/che-incubator/kubernetes-image-puller-operator v0.0.0-20250214104625-65e5ec32f521