diff --git a/.github/workflows/next-build.yaml b/.github/workflows/next-build.yaml index 8c416a9..cdc0b90 100644 --- a/.github/workflows/next-build.yaml +++ b/.github/workflows/next-build.yaml @@ -1,5 +1,5 @@ # -# Copyright (c) 2019-2023 Red Hat, Inc. +# Copyright (c) 2023 Red Hat, Inc. # This program and the accompanying materials are made # available under the terms of the Eclipse Public License 2.0 # which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -36,12 +36,12 @@ jobs: - id: vars shell: bash run: | - echo "::set-output name=sha_short::$(git rev-parse --short HEAD)" + echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT - name: Build and push both short SHA tag and next tag uses: docker/build-push-action@v3 with: file: build/dockerfiles/Dockerfile - platforms: linux/amd64,linux/ppc64le,linux/arm64 + platforms: linux/amd64,linux/arm64 push: true tags: | quay.io/che-incubator/configbump:next diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8d33cc2..772d8a6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,5 +1,5 @@ # -# Copyright (c) 2019-2023 Red Hat, Inc. +# Copyright (c) 2023 Red Hat, Inc. # This program and the accompanying materials are made # available under the terms of the Eclipse Public License 2.0 # which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -67,7 +67,7 @@ jobs: git config --global user.name "Mykhailo Kuznietsov" git config --global user.email "mkuznets@redhat.com" git config --global pull.rebase true - export GITHUB_TOKEN=${{ secrets.CHE_BOT_GITHUB_TOKEN }} + export GITHUB_TOKEN=${{ secrets.CHE_INCUBATOR_BOT_GITHUB_TOKEN }} NO_COMMIT=${{ github.event.inputs.noCommit}} if [[ $NO_COMMIT == "true" ]]; then NO_COMMIT="--no-commit" @@ -75,17 +75,17 @@ jobs: NO_COMMIT= fi /bin/bash make-release.sh --version ${{ github.event.inputs.version }} --trigger-release $NO_COMMIT - - name: Create failure MM message - if: ${{ failure() }} - run: | - echo "{\"text\":\":no_entry_sign: Che Configbump ${{ github.event.inputs.version }} release has failed: https://github.com/che-incubator/configbump/actions/workflows/release.yml\"}" > mattermost.json - - name: Create success MM message - run: | - echo "{\"text\":\":white_check_mark: Che Configbump ${{ github.event.inputs.version }} has been released: quay.io/che-incubator/configbump:${{ github.event.inputs.version }}\"}" > mattermost.json - - name: Send MM message - if: ${{ success() }} || ${{ failure() }} - uses: mattermost/action-mattermost-notify@1.1.0 - env: - MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK_URL }} - MATTERMOST_CHANNEL: eclipse-che-releases - MATTERMOST_USERNAME: che-bot + # - name: Create failure MM message + # if: ${{ failure() }} + # run: | + # echo "{\"text\":\":no_entry_sign: Che Configbump ${{ github.event.inputs.version }} release has failed: https://github.com/che-incubator/configbump/actions/workflows/release.yml\"}" > mattermost.json + # - name: Create success MM message + # run: | + # echo "{\"text\":\":white_check_mark: Che Configbump ${{ github.event.inputs.version }} has been released: quay.io/che-incubator/configbump:${{ github.event.inputs.version }}\"}" > mattermost.json + # - name: Send MM message + # if: ${{ success() }} || ${{ failure() }} + # uses: mattermost/action-mattermost-notify@1.1.0 + # env: + # MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK_URL }} + # MATTERMOST_CHANNEL: eclipse-che-releases + # MATTERMOST_USERNAME: che-bot diff --git a/README.md b/README.md index 287650e..c15777b 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ We originally wrote a prototype of this tool in Rust (https://github.com/metlos/ ``` $ ./configbump --help -config-bump 7.63.0-SNAPSHOT +config-bump 7.75.0-SNAPSHOT Usage: configbump --dir DIR --labels LABELS [--namespace NAMESPACE] Options: diff --git a/RELEASE.md b/RELEASE.md index a50bd3d..de40bab 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,3 +1,5 @@ # Eclipse Che Configbump release process Use "Release Che Configbump" workflow for release, which can be triggered manually on GitHub page of the repository at Actions -> "Release Che Configbump" -> "Run workflow" + +Normally this workflow will be triggered as part of a Che release - see https://github.com/eclipse-che/che-release/actions/workflows/release-orchestrate-overall.yml diff --git a/VERSION b/VERSION index 97e89f6..cf55e06 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.63.0-SNAPSHOT +7.75.0-SNAPSHOT diff --git a/cmd/configbump/main.go b/cmd/configbump/main.go index c6d2bd0..06ba56d 100644 --- a/cmd/configbump/main.go +++ b/cmd/configbump/main.go @@ -35,7 +35,7 @@ type opts struct { // Version returns the version of the program func (opts) Version() string { - return "config-bump 7.63.0-SNAPSHOT" + return "config-bump 7.75.0-SNAPSHOT" } const controllerName = "config-bump" diff --git a/make-release.sh b/make-release.sh old mode 100644 new mode 100755 index 86dbc61..c528d77 --- a/make-release.sh +++ b/make-release.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2019-2023 Red Hat, Inc. +# Copyright (c) 2023 Red Hat, Inc. # This program and the accompanying materials are made # available under the terms of the Eclipse Public License 2.0 # which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -36,7 +36,7 @@ done usage () { echo "Usage: $0 --version [VERSION TO RELEASE] [--trigger-release]" - echo "Example: $0 --version 7.7.0 --trigger-release"; echo + echo "Example: $0 --version 7.75.0 --trigger-release"; echo } if [[ ! ${VERSION} ]]; then @@ -50,7 +50,7 @@ releaseMachineExec() { --tag "${REGISTRY}/${ORGANIZATION}/${IMAGE}:${VERSION}" \ --push \ --provenance=false \ - -f ./${DOCKERFILE} . --platform "linux/amd64,linux/ppc64le,linux/arm64" | cat + -f ./${DOCKERFILE} . --platform "linux/amd64,linux/arm64" | cat echo "Pushed ${REGISTRY}/${ORGANIZATION}/${IMAGE}:${VERSION}" }