diff --git a/.github/workflows/regular-release.yaml b/.github/workflows/regular-release.yaml index 0b6c0b23e8d..88337985d10 100644 --- a/.github/workflows/regular-release.yaml +++ b/.github/workflows/regular-release.yaml @@ -37,6 +37,7 @@ jobs: with: tag_name: cbmc-${{ env.CBMC_VERSION }} release_name: cbmc-${{ env.CBMC_VERSION }} + prerelease: true body: | This is CBMC version ${{ env.CBMC_VERSION }}. diff --git a/.github/workflows/release-packages.yaml b/.github/workflows/release-packages.yaml index b837c6c61b7..0b6f2b3c40b 100644 --- a/.github/workflows/release-packages.yaml +++ b/.github/workflows/release-packages.yaml @@ -149,35 +149,35 @@ jobs: 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@v3 - - 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@v3 + # - 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 windows-msi-package: runs-on: windows-2019 @@ -273,34 +273,34 @@ jobs: 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@v3 - 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@v3 + # 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' }}" diff --git a/CMakeLists.txt b/CMakeLists.txt index bed1ee334b5..a840734a6c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,8 +40,8 @@ endif() # filenames) file( STRINGS src/config.inc CBMC_VERSION - REGEX "CBMC_VERSION = (.*)") -string(REGEX REPLACE "CBMC_VERSION = (.*)" "\\1" CBMC_VERSION ${CBMC_VERSION}) + REGEX "CBMC_VERSION = ([0-9.]+).*") +string(REGEX REPLACE "CBMC_VERSION = ([0-9.]+).*" "\\1" CBMC_VERSION ${CBMC_VERSION}) message(STATUS "Building CBMC version ${CBMC_VERSION}") project(CBMC VERSION ${CBMC_VERSION}) diff --git a/src/config.inc b/src/config.inc index 7431c81bfdc..d83f625abdf 100644 --- a/src/config.inc +++ b/src/config.inc @@ -76,7 +76,7 @@ endif OSX_IDENTITY="Developer ID Application: Daniel Kroening" # Detailed version information -CBMC_VERSION = 5.95.1 +CBMC_VERSION = 6.0.0-preview # Use the CUDD library for BDDs, can be installed using `make -C src cudd-download` # CUDD = ../../cudd-3.0.0 diff --git a/src/libcprover-rust/Cargo.toml b/src/libcprover-rust/Cargo.toml index 87c7e4b3d91..37a3e866325 100644 --- a/src/libcprover-rust/Cargo.toml +++ b/src/libcprover-rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "libcprover_rust" -version = "5.95.1" +version = "6.0.0-preview" edition = "2021" description = "Rust API for CBMC and assorted CProver tools" repository = "https://github.com/diffblue/cbmc" diff --git a/v6_undo_stack.markdown b/v6_undo_stack.markdown new file mode 100644 index 00000000000..4f6a7507a41 --- /dev/null +++ b/v6_undo_stack.markdown @@ -0,0 +1,17 @@ +# 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`)