From 695c872615aa7315369174f99781b186cb98e6a4 Mon Sep 17 00:00:00 2001 From: Michael Tautschnig Date: Mon, 20 Jan 2025 13:51:16 +0000 Subject: [PATCH] Upgrade CVC5 in CI to 1.2.0 This prepares for Arm64 runs: CVC5 CI releases CVC5 for Arm64 starting from 1.2.0. --- .github/workflows/coverage.yaml | 8 +-- .github/workflows/pull-request-checks.yaml | 68 +++++++++++----------- .github/workflows/release-packages.yaml | 20 +++---- 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index 9b549598846..6eca4c58201 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -5,7 +5,7 @@ on: pull_request: branches: [ develop ] env: - cvc5-version: "1.1.2" + cvc5-version: "1.2.0" linux-vcpus: 4 windows-vcpus: 4 @@ -36,9 +36,9 @@ jobs: run: z3 --version - name: Download cvc-5 from the releases page and make sure it can be deployed run: | - wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux-static.zip - unzip -j -d /usr/local/bin cvc5-Linux-static.zip cvc5-Linux-static/bin/cvc5 - rm cvc5-Linux-static.zip + wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux-x86_64-static.zip + unzip -j -d /usr/local/bin cvc5-Linux-x86_64-static.zip cvc5-Linux-x86_64-static/bin/cvc5 + rm cvc5-Linux-x86_64-static.zip cvc5 --version - name: Prepare ccache uses: actions/cache@v4 diff --git a/.github/workflows/pull-request-checks.yaml b/.github/workflows/pull-request-checks.yaml index 8ab4a9e7e86..05d8991c025 100644 --- a/.github/workflows/pull-request-checks.yaml +++ b/.github/workflows/pull-request-checks.yaml @@ -5,7 +5,7 @@ on: pull_request: branches: [ develop ] env: - cvc5-version: "1.1.2" + cvc5-version: "1.2.0" linux-vcpus: 4 windows-vcpus: 4 @@ -29,9 +29,9 @@ jobs: run: z3 --version - name: Download cvc-5 from the releases page and make sure it can be deployed run: | - wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux-static.zip - unzip -j -d /usr/local/bin cvc5-Linux-static.zip cvc5-Linux-static/bin/cvc5 - rm cvc5-Linux-static.zip + wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux-x86_64-static.zip + unzip -j -d /usr/local/bin cvc5-Linux-x86_64-static.zip cvc5-Linux-x86_64-static/bin/cvc5 + rm cvc5-Linux-x86_64-static.zip cvc5 --version - name: Prepare ccache uses: actions/cache@v4 @@ -115,9 +115,9 @@ jobs: run: z3 --version - name: Download cvc-5 from the releases page and make sure it can be deployed run: | - wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux-static.zip - unzip -j -d /usr/local/bin cvc5-Linux-static.zip cvc5-Linux-static/bin/cvc5 - rm cvc5-Linux-static.zip + wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux-x86_64-static.zip + unzip -j -d /usr/local/bin cvc5-Linux-x86_64-static.zip cvc5-Linux-x86_64-static/bin/cvc5 + rm cvc5-Linux-x86_64-static.zip cvc5 --version - name: Prepare ccache uses: actions/cache@v4 @@ -225,9 +225,9 @@ jobs: run: z3 --version - name: Download cvc-5 from the releases page and make sure it can be deployed run: | - wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux-static.zip - unzip -j -d /usr/local/bin cvc5-Linux-static.zip cvc5-Linux-static/bin/cvc5 - rm cvc5-Linux-static.zip + wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux-x86_64-static.zip + unzip -j -d /usr/local/bin cvc5-Linux-x86_64-static.zip cvc5-Linux-x86_64-static/bin/cvc5 + rm cvc5-Linux-x86_64-static.zip cvc5 --version - name: Prepare ccache uses: actions/cache@v4 @@ -297,9 +297,9 @@ jobs: run: z3 --version - name: Download cvc-5 from the releases page and make sure it can be deployed run: | - wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux-static.zip - unzip -j -d /usr/local/bin cvc5-Linux-static.zip cvc5-Linux-static/bin/cvc5 - rm cvc5-Linux-static.zip + wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux-x86_64-static.zip + unzip -j -d /usr/local/bin cvc5-Linux-x86_64-static.zip cvc5-Linux-x86_64-static/bin/cvc5 + rm cvc5-Linux-x86_64-static.zip cvc5 --version - name: Prepare ccache uses: actions/cache@v4 @@ -363,9 +363,9 @@ jobs: run: z3 --version - name: Download cvc-5 from the releases page and make sure it can be deployed run: | - wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux-static.zip - unzip -j -d /usr/local/bin cvc5-Linux-static.zip cvc5-Linux-static/bin/cvc5 - rm cvc5-Linux-static.zip + wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux-x86_64-static.zip + unzip -j -d /usr/local/bin cvc5-Linux-x86_64-static.zip cvc5-Linux-x86_64-static/bin/cvc5 + rm cvc5-Linux-x86_64-static.zip cvc5 --version - name: Prepare ccache uses: actions/cache@v4 @@ -423,9 +423,9 @@ jobs: run: z3 --version - name: Download cvc-5 from the releases page and make sure it can be deployed run: | - wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux-static.zip - unzip -j -d /usr/local/bin cvc5-Linux-static.zip cvc5-Linux-static/bin/cvc5 - rm cvc5-Linux-static.zip + wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux-x86_64-static.zip + unzip -j -d /usr/local/bin cvc5-Linux-x86_64-static.zip cvc5-Linux-x86_64-static/bin/cvc5 + rm cvc5-Linux-x86_64-static.zip cvc5 --version - name: Prepare ccache uses: actions/cache@v4 @@ -470,9 +470,9 @@ jobs: run: z3 --version - name: Download cvc-5 from the releases page and make sure it can be deployed run: | - wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux-static.zip - unzip -j -d /usr/local/bin cvc5-Linux-static.zip cvc5-Linux-static/bin/cvc5 - rm cvc5-Linux-static.zip + wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux-x86_64-static.zip + unzip -j -d /usr/local/bin cvc5-Linux-x86_64-static.zip cvc5-Linux-x86_64-static/bin/cvc5 + rm cvc5-Linux-x86_64-static.zip cvc5 --version - name: Prepare ccache uses: actions/cache@v4 @@ -600,9 +600,9 @@ jobs: run: z3 --version - name: Download cvc5 binary and make sure it can be deployed run: | - wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-macOS-static.zip - unzip -j -d /usr/local/bin cvc5-macOS-static.zip cvc5-macOS-static/bin/cvc5 - rm cvc5-macOS-static.zip + wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-macOS-x86_64-static.zip + unzip -j -d /usr/local/bin cvc5-macOS-x86_64-static.zip cvc5-macOS-x86_64-static/bin/cvc5 + rm cvc5-macOS-x86_64-static.zip cvc5 --version - name: Prepare ccache uses: actions/cache@v4 @@ -652,9 +652,9 @@ jobs: run: z3 --version - name: Download cvc5 binary and make sure it can be deployed run: | - wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-macOS-static.zip - unzip -j -d /usr/local/bin cvc5-macOS-static.zip cvc5-macOS-static/bin/cvc5 - rm cvc5-macOS-static.zip + wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-macOS-arm64-static.zip + unzip -j -d /usr/local/bin cvc5-macOS-arm64-static.zip cvc5-macOS-arm64-static/bin/cvc5 + rm cvc5-macOS-arm64-static.zip cvc5 --version - name: Prepare ccache uses: actions/cache@v4 @@ -708,9 +708,9 @@ jobs: Expand-Archive -LiteralPath '.\z3.Zip' -DestinationPath C:\tools echo "c:\tools\z3-4.8.10-x64-win\bin;" >> $env:GITHUB_PATH New-Item -ItemType directory "C:\tools\cvc5" - Invoke-WebRequest -Uri https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Win64-static.zip -OutFile .\cvc5-Win64-static.zip - Expand-Archive -LiteralPath '.\cvc5-Win64-static.Zip' - Move-Item -Path .\cvc5-Win64-static\cvc5-Win64-static\bin\cvc5.exe c:\tools\cvc5\cvc5.exe + Invoke-WebRequest -Uri https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Win64-x86_64-static.zip -OutFile .\cvc5-Win64-x86_64-static.zip + Expand-Archive -LiteralPath '.\cvc5-Win64-x86_64-static.Zip' + Move-Item -Path .\cvc5-Win64-x86_64-static\cvc5-Win64-x86_64-static\bin\cvc5.exe c:\tools\cvc5\cvc5.exe echo "c:\tools\cvc5;" >> $env:GITHUB_PATH - name: Confirm z3 solver is available and log the version installed run: z3 --version @@ -771,9 +771,9 @@ jobs: Expand-Archive -LiteralPath '.\z3.Zip' -DestinationPath C:\tools echo "c:\tools\z3-4.8.10-x64-win\bin;" >> $env:GITHUB_PATH New-Item -ItemType directory "C:\tools\cvc5" - Invoke-WebRequest -Uri https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Win64-static.zip -OutFile .\cvc5-Win64-static.zip - Expand-Archive -LiteralPath '.\cvc5-Win64-static.Zip' - Move-Item -Path .\cvc5-Win64-static\cvc5-Win64-static\bin\cvc5.exe c:\tools\cvc5\cvc5.exe + Invoke-WebRequest -Uri https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Win64-x86_64-static.zip -OutFile .\cvc5-Win64-x86_64-static.zip + Expand-Archive -LiteralPath '.\cvc5-Win64-x86_64-static.Zip' + Move-Item -Path .\cvc5-Win64-x86_64-static\cvc5-Win64-x86_64-static\bin\cvc5.exe c:\tools\cvc5\cvc5.exe echo "c:\tools\cvc5;" >> $env:GITHUB_PATH New-Item -ItemType directory "C:\tools\parallel" wget.exe -O c:\tools\parallel\parallel https://git.savannah.gnu.org/cgit/parallel.git/plain/src/parallel diff --git a/.github/workflows/release-packages.yaml b/.github/workflows/release-packages.yaml index 0e7fab7e1b3..78fd4b4df75 100644 --- a/.github/workflows/release-packages.yaml +++ b/.github/workflows/release-packages.yaml @@ -2,7 +2,7 @@ on: release: types: [created] env: - cvc5-version: "1.1.2" + cvc5-version: "1.2.0" name: Upload additional release assets jobs: @@ -22,9 +22,9 @@ jobs: run: z3 --version - name: Download cvc-5 from the releases page and make sure it can be deployed run: | - wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux-static.zip - unzip -j -d /usr/local/bin cvc5-Linux-static.zip cvc5-Linux-static/bin/cvc5 - rm cvc5-Linux-static.zip + wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux-x86_64-static.zip + unzip -j -d /usr/local/bin cvc5-Linux-x86_64-static.zip cvc5-Linux-x86_64-static/bin/cvc5 + rm cvc5-Linux-x86_64-static.zip cvc5 --version - name: Prepare ccache uses: actions/cache@v4 @@ -93,9 +93,9 @@ jobs: run: z3 --version - name: Download cvc-5 from the releases page and make sure it can be deployed run: | - wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux-static.zip - unzip -j -d /usr/local/bin cvc5-Linux-static.zip cvc5-Linux-static/bin/cvc5 - rm cvc5-Linux-static.zip + wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux-x86_64-static.zip + unzip -j -d /usr/local/bin cvc5-Linux-x86_64-static.zip cvc5-Linux-x86_64-static/bin/cvc5 + rm cvc5-Linux-x86_64-static.zip cvc5 --version - name: Prepare ccache uses: actions/cache@v4 @@ -164,9 +164,9 @@ jobs: run: z3 --version - name: Download cvc-5 from the releases page and make sure it can be deployed run: | - wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux-static.zip - unzip -j -d /usr/local/bin cvc5-Linux-static.zip cvc5-Linux-static/bin/cvc5 - rm cvc5-Linux-static.zip + wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux-x86_64-static.zip + unzip -j -d /usr/local/bin cvc5-Linux-x86_64-static.zip cvc5-Linux-x86_64-static/bin/cvc5 + rm cvc5-Linux-x86_64-static.zip cvc5 --version - name: Prepare ccache uses: actions/cache@v4