From 8ae24e2b387aece62089881202548169658a75c3 Mon Sep 17 00:00:00 2001 From: Nikolaj Bjorner Date: Fri, 31 Jan 2025 09:28:51 -0800 Subject: [PATCH] update release version --- .github/workflows/docker-image.yml | 62 ------------------------------ CMakeLists.txt | 2 +- RELEASE_NOTES.md | 7 ++++ scripts/mk_project.py | 2 +- scripts/nightly.yaml | 4 +- scripts/release.yml | 2 +- src/params/sls_params.pyg | 2 +- 7 files changed, 13 insertions(+), 68 deletions(-) delete mode 100644 .github/workflows/docker-image.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml deleted file mode 100644 index e84b7b121..000000000 --- a/.github/workflows/docker-image.yml +++ /dev/null @@ -1,62 +0,0 @@ -name: Publish Docker image - -on: - workflow_dispatch: # on button click - -permissions: - contents: read - -jobs: - push_to_registry: - name: Push Docker image to GitHub Docker registry - runs-on: ubuntu-latest - - steps: - - name: Check out the repo - uses: actions/checkout@v4 - - - name: Log in to GitHub Docker registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - # ------- - # BARE Z3 - # ------- - - name: Extract metadata (tags, labels) for Bare Z3 Docker Image - id: meta - uses: docker/metadata-action@v5 - with: - images: ghcr.io/z3prover/z3 - flavor: | - latest=auto - prefix=ubuntu-20.04-bare-z3- - tags: | - type=schedule,pattern={{date 'YYYYMMDD'}} - type=ref,event=tag - type=edge - type=sha,prefix=ubuntu-20.04-bare-z3-sha- - - name: Build and push Bare Z3 Docker Image - uses: docker/build-push-action@v6.13.0 - with: - context: . - push: true - target: bare-z3 - file: ./docker/ubuntu-20-04.Dockerfile - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - - # ------------------------------ - # Repo description on GHCR - # ------------------------------ -# - name: Update repo description -# uses: peter-evans/dockerhub-description@v2 -# with: -# registry: ghcr.io -# repository: z3prover/z3 -# username: ${{ secrets.DOCKER_USERNAME }} -# password: ${{ secrets.DOCKER_PASSWORD }} -# short-description: ${{ github.event.repository.description }} -# readme-filepath: ./docker/README.md diff --git a/CMakeLists.txt b/CMakeLists.txt index 9aad103ab..a4e4df2e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16) set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cxx_compiler_flags_overrides.cmake") -project(Z3 VERSION 4.13.4.0 LANGUAGES CXX) +project(Z3 VERSION 4.14.0.0 LANGUAGES CXX) ################################################################################ # Project version diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index eb5540ee4..71c5ea881 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -10,6 +10,13 @@ Version 4.next - native word level bit-vector solving. - introduction of simple induction lemmas to handle a limited repertoire of induction proofs. +Versoin 4.14.0 +============== +- [SLS modulo theories](https://microsoft.github.io/z3guide/programming/Local%20Search/) engine v1 release. +- API for accessing term [depth and groundness](https://github.com/Z3Prover/z3/pull/7479). +- A new API for solving LRA variables modulo constraints. +- Performance and bug fixes. + Version 4.13.4 ============== - several updates to emscripten including #7473 diff --git a/scripts/mk_project.py b/scripts/mk_project.py index 5d9a5ae69..96034dea1 100644 --- a/scripts/mk_project.py +++ b/scripts/mk_project.py @@ -8,7 +8,7 @@ from mk_util import * def init_version(): - set_version(4, 13, 4, 0) # express a default build version or pick up ci build version + set_version(4, 14, 0, 0) # express a default build version or pick up ci build version # Z3 Project definition def init_project_def(): diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index c8dc16d62..50c68ffb4 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -1,7 +1,7 @@ variables: Major: '4' - Minor: '13' - Patch: '4' + Minor: '14' + Patch: '0' ReleaseVersion: $(Major).$(Minor).$(Patch) AssemblyVersion: $(Major).$(Minor).$(Patch).$(Build.BuildId) NightlyVersion: $(AssemblyVersion)-$(Build.buildId) diff --git a/scripts/release.yml b/scripts/release.yml index ce27ded96..21cde1956 100644 --- a/scripts/release.yml +++ b/scripts/release.yml @@ -6,7 +6,7 @@ trigger: none variables: - ReleaseVersion: '4.13.4' + ReleaseVersion: '4.14.0' stages: diff --git a/src/params/sls_params.pyg b/src/params/sls_params.pyg index 66f3c82a3..eeefe0cc6 100644 --- a/src/params/sls_params.pyg +++ b/src/params/sls_params.pyg @@ -1,6 +1,6 @@ def_module_params('sls', export=True, - description='Experimental Stochastic Local Search Solver (for QFBV only).', + description='Stochastic Local Search Solver (invoked by sls-qfbv and sls-smt tactics or enabled by smt.sls.enable=true)', params=(max_memory_param(), ('max_restarts', UINT, UINT_MAX, 'maximum number of restarts'), ('max_repairs', UINT, 1000, 'maximum number of repairs before restart'),