From 50f669a8e45b07b1e219d3ce7ce07df6cce90bd7 Mon Sep 17 00:00:00 2001 From: Anatolii Bazko Date: Mon, 16 Feb 2026 12:57:17 +0100 Subject: [PATCH 1/4] fix: operator image build Signed-off-by: Anatolii Bazko --- ...lease-next-catalog-and-operator-image.yaml | 71 ++++++------------- 1 file changed, 23 insertions(+), 48 deletions(-) diff --git a/.github/workflows/release-next-catalog-and-operator-image.yaml b/.github/workflows/release-next-catalog-and-operator-image.yaml index 31e189835..ba7012d99 100644 --- a/.github/workflows/release-next-catalog-and-operator-image.yaml +++ b/.github/workflows/release-next-catalog-and-operator-image.yaml @@ -23,68 +23,43 @@ on: - main jobs: build-operator-image-multiarch: - strategy: - fail-fast: false - matrix: - runners: ['ubuntu-24.04', 'ubuntu-24.04-arm'] - runs-on: ${{matrix.runners}} + runs-on: ubuntu-latest + + outputs: + git-sha: ${{ steps.git-sha.outputs.sha }} + steps: - name: Checkout source code uses: actions/checkout@v4 - - name: Set arch environment variable - run: | - if [[ ${{matrix.runners}} == 'ubuntu-24.04' ]]; then - echo arch="amd64" >> $GITHUB_ENV - else - echo arch="arm64" >> $GITHUB_ENV - fi - - name: Set short_sha environment variable - run: echo short_sha="$(git rev-parse --short=7 HEAD)" >> $GITHUB_ENV + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Set output for Git short SHA + id: git-sha + run: echo "sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT + - name: Login to quay.io uses: docker/login-action@v2 with: username: ${{ secrets.QUAY_USERNAME }} password: ${{ secrets.QUAY_PASSWORD }} registry: quay.io - - name: Build operator image - run: | - docker buildx build \ - --platform linux/${{env.arch}} \ - --progress=plain \ - --push \ - -t quay.io/eclipse/che-operator:${{env.arch}}-${{env.short_sha}} . - publish-operator-manifest: - name: publish operator image - runs-on: ubuntu-24.04 - needs: build-operator-image-multiarch - steps: - - name: Checkout source code - uses: actions/checkout@v4 - - name: Login to Quay.io - uses: docker/login-action@v2 + - name: Build and push + uses: docker/build-push-action@v4.2.1 with: - registry: quay.io - username: ${{ secrets.QUAY_USERNAME }} - password: ${{ secrets.QUAY_PASSWORD }} - - name: Set short_sha environment variable - run: echo short_sha="$(git rev-parse --short=7 HEAD)" >> $GITHUB_ENV - - name: publish - run: | - docker manifest create quay.io/eclipse/che-operator:next \ - --amend quay.io/eclipse/che-operator:amd64-${{env.short_sha}} \ - --amend quay.io/eclipse/che-operator:arm64-${{env.short_sha}} - docker manifest annotate quay.io/eclipse/che-operator:next \ - quay.io/eclipse/che-operator:amd64-${{env.short_sha}} \ - --os linux --arch amd64 - docker manifest annotate quay.io/eclipse/che-operator:next \ - quay.io/eclipse/che-operator:arm64-${{env.short_sha}} \ - --os linux --arch arm64 - docker manifest push quay.io/eclipse/che-operator:next + context: . + push: true + platforms: linux/amd64, linux/arm64, linux/ppc64le, linux/s390x + tags: | + quay.io/eclipse/che-operator:next + quay.io/eclipse/che-operator:sha-${{ steps.git-sha.outputs.sha }} + file: ./Dockerfile build-catalog: runs-on: ubuntu-24.04 - needs: publish-operator-manifest + needs: build-operator-image-multiarch steps: - name: Checkout source code uses: actions/checkout@v4 From 102a7cdacedaeef352be46f11c9e48115525d701 Mon Sep 17 00:00:00 2001 From: Anatolii Bazko Date: Mon, 16 Feb 2026 13:19:19 +0100 Subject: [PATCH 2/4] fix: operator image build Signed-off-by: Anatolii Bazko --- .github/workflows/minikube-test-helm.yaml | 2 +- .github/workflows/minikube-test-upgrade-stable-to-next.yaml | 2 +- .github/workflows/minikube-test-upgrade-stable-to-stable.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/minikube-test-helm.yaml b/.github/workflows/minikube-test-helm.yaml index 19375c47c..41bdda4b1 100644 --- a/.github/workflows/minikube-test-helm.yaml +++ b/.github/workflows/minikube-test-helm.yaml @@ -22,7 +22,7 @@ jobs: id: run-minikube uses: che-incubator/setup-minikube-action@next with: - minikube-version: v1.29.0 + minikube-version: v1.37.0 - name: Install yq run: sudo pip install yq - name: Install chectl diff --git a/.github/workflows/minikube-test-upgrade-stable-to-next.yaml b/.github/workflows/minikube-test-upgrade-stable-to-next.yaml index fbe671c7e..84d0aa0f5 100644 --- a/.github/workflows/minikube-test-upgrade-stable-to-next.yaml +++ b/.github/workflows/minikube-test-upgrade-stable-to-next.yaml @@ -25,7 +25,7 @@ jobs: id: run-minikube uses: che-incubator/setup-minikube-action@next with: - minikube-version: v1.29.0 + minikube-version: v1.37.0 - name: Install yq run: sudo pip install yq - name: Install chectl diff --git a/.github/workflows/minikube-test-upgrade-stable-to-stable.yaml b/.github/workflows/minikube-test-upgrade-stable-to-stable.yaml index 40a7d59f0..1b4d5831f 100644 --- a/.github/workflows/minikube-test-upgrade-stable-to-stable.yaml +++ b/.github/workflows/minikube-test-upgrade-stable-to-stable.yaml @@ -25,7 +25,7 @@ jobs: id: run-minikube uses: che-incubator/setup-minikube-action@next with: - minikube-version: v1.29.0 + minikube-version: v1.37.0 - name: Install yq run: sudo pip install yq - name: Install chectl From 2fae38613711370f71ea86f2ebdf43ba608efcd5 Mon Sep 17 00:00:00 2001 From: Anatolii Bazko Date: Mon, 16 Feb 2026 13:28:21 +0100 Subject: [PATCH 3/4] fix: operator image build Signed-off-by: Anatolii Bazko --- .github/workflows/devfile-ci.yaml | 4 ++-- .../workflows/release-next-catalog-and-operator-image.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/devfile-ci.yaml b/.github/workflows/devfile-ci.yaml index 2741b89ba..7a0457b73 100644 --- a/.github/workflows/devfile-ci.yaml +++ b/.github/workflows/devfile-ci.yaml @@ -28,7 +28,7 @@ jobs: uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 @@ -41,7 +41,7 @@ jobs: password: ${{ secrets.QUAY_PASSWORD }} - name: Build and push container - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v6 with: context: . file: .devfile.Dockerfile diff --git a/.github/workflows/release-next-catalog-and-operator-image.yaml b/.github/workflows/release-next-catalog-and-operator-image.yaml index ba7012d99..f70ce659f 100644 --- a/.github/workflows/release-next-catalog-and-operator-image.yaml +++ b/.github/workflows/release-next-catalog-and-operator-image.yaml @@ -47,7 +47,7 @@ jobs: registry: quay.io - name: Build and push - uses: docker/build-push-action@v4.2.1 + uses: docker/build-push-action@v6 with: context: . push: true From e7b7636dc8a60fd9a461a65cf9dabcb6c519d063 Mon Sep 17 00:00:00 2001 From: Anatolii Bazko Date: Mon, 16 Feb 2026 13:34:18 +0100 Subject: [PATCH 4/4] fix: operator image build Signed-off-by: Anatolii Bazko --- .github/workflows/devfile-ci.yaml | 2 +- .../release-next-catalog-and-operator-image.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/devfile-ci.yaml b/.github/workflows/devfile-ci.yaml index 7a0457b73..5223cda56 100644 --- a/.github/workflows/devfile-ci.yaml +++ b/.github/workflows/devfile-ci.yaml @@ -34,7 +34,7 @@ jobs: uses: docker/setup-buildx-action@v2 - name: Login to quay.io - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: quay.io username: ${{ secrets.QUAY_USERNAME }} diff --git a/.github/workflows/release-next-catalog-and-operator-image.yaml b/.github/workflows/release-next-catalog-and-operator-image.yaml index f70ce659f..0330e1fa9 100644 --- a/.github/workflows/release-next-catalog-and-operator-image.yaml +++ b/.github/workflows/release-next-catalog-and-operator-image.yaml @@ -23,7 +23,7 @@ on: - main jobs: build-operator-image-multiarch: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 outputs: git-sha: ${{ steps.git-sha.outputs.sha }} @@ -37,10 +37,10 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Set output for Git short SHA id: git-sha - run: echo "sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT + run: echo "sha=$(git rev-parse --short=7 HEAD)" >> $GITHUB_OUTPUT - name: Login to quay.io - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.QUAY_USERNAME }} password: ${{ secrets.QUAY_PASSWORD }} @@ -70,7 +70,7 @@ jobs: - name: Install yq run: sudo pip install yq - name: Login to quay.io - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.QUAY_USERNAME }} password: ${{ secrets.QUAY_PASSWORD }} @@ -96,7 +96,7 @@ jobs: - name: Install yq run: sudo pip install yq - name: Login to quay.io - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.QUAY_USERNAME }} password: ${{ secrets.QUAY_PASSWORD }}