diff --git a/.github/workflows/regular-release.yaml b/.github/workflows/regular-release.yaml index 89bd96c49ef..a91a2841592 100644 --- a/.github/workflows/regular-release.yaml +++ b/.github/workflows/regular-release.yaml @@ -37,7 +37,8 @@ jobs: with: tag_name: cbmc-${{ env.CBMC_VERSION }} release_name: cbmc-${{ env.CBMC_VERSION }} - prerelease: true + draft: false + prerelease: false body: | This is CBMC version ${{ env.CBMC_VERSION }}. @@ -95,8 +96,6 @@ jobs: That will initialise an execution of the container based on the image pushed as part of this release. The CProver tools are present in the `$PATH` of the container. - draft: false - prerelease: false - name: Slack notification of successful release uses: rtCamp/action-slack-notify@v2 env: diff --git a/.github/workflows/release-packages.yaml b/.github/workflows/release-packages.yaml index 26e6f4fa6b5..a8e08f94804 100644 --- a/.github/workflows/release-packages.yaml +++ b/.github/workflows/release-packages.yaml @@ -70,7 +70,7 @@ jobs: uses: rtCamp/action-slack-notify@v2 if: success() || failure() env: - SLACK_CHANNEL: team_open_source + SLACK_CHANNEL: aws-cbmc SLACK_COLOR: ${{ job.status }} SLACK_USERNAME: Github Actions CI bot SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} @@ -143,41 +143,41 @@ jobs: uses: rtCamp/action-slack-notify@v2 if: success() || failure() env: - SLACK_CHANNEL: team_open_source + SLACK_CHANNEL: aws-cbmc SLACK_COLOR: ${{ job.status }} SLACK_USERNAME: Github Actions CI bot SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} SLACK_MESSAGE: "${{ job.status == 'success' && 'Ubuntu 20.04 package built and uploaded successfully' || 'Ubuntu 20.04 package build failed' }}" - # homebrew-pr: - # runs-on: macos-11 - # steps: - # - name: Get release tag name - # # The GITHUB_REF we get has refs/tags/ in front of the tag name so we - # # strip that here - # run: echo "RELEASE_TAG=${GITHUB_REF/refs\/tags\/}" >> $GITHUB_ENV - # - name: Configure git user name and email - # uses: Homebrew/actions/git-user-config@07da0794847043a11761f14c97cc682577c74d5d - # with: - # username: db-ci-cprover - # - name: Create homebrew PR - # run: | - # brew update-reset - # brew bump-formula-pr --tag "$RELEASE_TAG" --revision "$GITHUB_SHA" cbmc - # env: - # HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.DB_CI_CPROVER_ACCESS_TOKEN }} - # - name: Checkout CBMC project source code to obtain access to scripts - # if: always() - # uses: actions/checkout@v4 - # - name: Slack notification of CI status - # if: success() || failure() - # env: - # SLACK_CHANNEL: team_open_source - # SLACK_COLOR: ${{ job.status }} - # SLACK_USERNAME: Github Actions CI bot - # SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - # SLACK_MESSAGE: "${{ job.status == 'success' && 'Homebrew PR submitted successfully' || 'Homebrew PR failed' }}" - # run: go run scripts/slack_notification_action.go + homebrew-pr: + runs-on: macos-11 + steps: + - name: Get release tag name + # The GITHUB_REF we get has refs/tags/ in front of the tag name so we + # strip that here + run: echo "RELEASE_TAG=${GITHUB_REF/refs\/tags\/}" >> $GITHUB_ENV + - name: Configure git user name and email + uses: Homebrew/actions/git-user-config@07da0794847043a11761f14c97cc682577c74d5d + with: + username: db-ci-cprover + - name: Create homebrew PR + run: | + brew update-reset + brew bump-formula-pr --tag "$RELEASE_TAG" --revision "$GITHUB_SHA" cbmc + env: + HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.DB_CI_CPROVER_ACCESS_TOKEN }} + - name: Checkout CBMC project source code to obtain access to scripts + if: always() + uses: actions/checkout@v4 + - name: Slack notification of CI status + if: success() || failure() + env: + SLACK_CHANNEL: aws-cbmc + SLACK_COLOR: ${{ job.status }} + SLACK_USERNAME: Github Actions CI bot + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} + SLACK_MESSAGE: "${{ job.status == 'success' && 'Homebrew PR submitted successfully' || 'Homebrew PR failed' }}" + run: go run scripts/slack_notification_action.go windows-msi-package: runs-on: windows-2019 @@ -266,41 +266,41 @@ jobs: - name: Slack notification of CI status if: success() || failure() env: - SLACK_CHANNEL: team_open_source + SLACK_CHANNEL: aws-cbmc SLACK_COLOR: ${{ job.status }} SLACK_USERNAME: Github Actions CI bot SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} SLACK_MESSAGE: "${{ job.status == 'success' && 'Windows package built and uploaded successfully' || 'Windows package build failed' }}" run: go run scripts/slack_notification_action.go - # push-docker-image-dockerhub: - # runs-on: ubuntu-20.04 - # steps: - # - name: Checkout CBMC source - # uses: actions/checkout@v4 - # with: - # submodules: recursive - # - name: Set Image Tag - # run: | - # # Isolate the version number from a reference to a tag, for example, - # # '5.20.3' from a string like 'refs/tags/cbmc-5.20.3-exp' - # VERSION=$(echo ${{ github.ref }} | cut -d "/" -f 3 | cut -d "-" -f 2) - # echo "IMAGE_TAG=diffblue/cbmc:$VERSION" >> $GITHUB_ENV - # - name: Build docker image - # run: docker build -t "$IMAGE_TAG" . - # - name: Push docker image to DockerHub - # run: | - # echo ${{ secrets.DOCKERHUB_ACCESS_DB_CI_CPROVER }} | docker login --username=dbcicprover --password-stdin - # docker image push "$IMAGE_TAG" - # # For security reasons remove stored login credentials from - # # configuration file they are stored at by docker login. - # docker logout - # - name: Slack notification of CI status - # uses: rtCamp/action-slack-notify@v2 - # if: success() || failure() - # env: - # SLACK_CHANNEL: team_open_source - # SLACK_COLOR: ${{ job.status }} - # SLACK_USERNAME: Github Actions CI bot - # SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - # SLACK_MESSAGE: "${{ job.status == 'success' && 'Docker Image built and submitted to DockerHub successfully' || 'Docker Image build failed' }}" + push-docker-image-dockerhub: + runs-on: ubuntu-20.04 + steps: + - name: Checkout CBMC source + uses: actions/checkout@v4 + with: + submodules: recursive + - name: Set Image Tag + run: | + # Isolate the version number from a reference to a tag, for example, + # '5.20.3' from a string like 'refs/tags/cbmc-5.20.3-exp' + VERSION=$(echo ${{ github.ref }} | cut -d "/" -f 3 | cut -d "-" -f 2) + echo "IMAGE_TAG=diffblue/cbmc:$VERSION" >> $GITHUB_ENV + - name: Build docker image + run: docker build -t "$IMAGE_TAG" . + - name: Push docker image to DockerHub + run: | + echo ${{ secrets.DOCKERHUB_ACCESS_DB_CI_CPROVER }} | docker login --username=dbcicprover --password-stdin + docker image push "$IMAGE_TAG" + # For security reasons remove stored login credentials from + # configuration file they are stored at by docker login. + docker logout + - name: Slack notification of CI status + uses: rtCamp/action-slack-notify@v2 + if: success() || failure() + env: + SLACK_CHANNEL: aws-cbmc + SLACK_COLOR: ${{ job.status }} + SLACK_USERNAME: Github Actions CI bot + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} + SLACK_MESSAGE: "${{ job.status == 'success' && 'Docker Image built and submitted to DockerHub successfully' || 'Docker Image build failed' }}" diff --git a/v6_undo_stack.markdown b/v6_undo_stack.markdown deleted file mode 100644 index 4f6a7507a41..00000000000 --- a/v6_undo_stack.markdown +++ /dev/null @@ -1,17 +0,0 @@ -# Temporary changes for v6 - -This is a temporary file, containing changes done to release process for v6, -that need to be reverted back. - -It's a file in the repository to allow for easier tracking of the status -of things among the broader community, and to allow everyone to add/delete -things they believe should be in here. - -The file is scheduled for deletion by the actual release of `v6` and subsequent -rollback of the changes. - -## Stack - -* Revert changes to homebrew PR push (`.github/workflows/release-packages.yaml`) -* Revert changes to docker image push (`.github/workflows/releas-packages.yaml`) -* Remove marking of release as `prerelease` (`.github/workflows/regular-release.yaml`)