From 54b54e99ba6d5b1c7a8abbb1f2a87249bbf13635 Mon Sep 17 00:00:00 2001 From: Michael Tautschnig Date: Fri, 8 Apr 2022 19:50:47 +0000 Subject: [PATCH 1/2] Make sure all CI jobs running tests have CVC5 installed As of #6777, the codecov job kept failing for CVC5 wasn't available in this job. The same would have been true of release jobs, but we haven't had one since #6777 was merged. --- .github/workflows/pull-request-checks.yaml | 6 ++++++ .github/workflows/release-packages.yaml | 14 ++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/.github/workflows/pull-request-checks.yaml b/.github/workflows/pull-request-checks.yaml index c710c881c2b..e7fef9a91a9 100644 --- a/.github/workflows/pull-request-checks.yaml +++ b/.github/workflows/pull-request-checks.yaml @@ -734,6 +734,12 @@ jobs: sudo apt-get install --no-install-recommends -y g++ gcc gdb binutils flex bison cmake maven jq libxml2-utils openjdk-11-jdk-headless lcov ccache z3 - name: Confirm z3 solver is available and log the version installed run: z3 --version + - name: Download cvc-5 from the releases page and make sure it can be deployed + run: | + wget -O cvc5 https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux + chmod u+x cvc5 + mv cvc5 /usr/local/bin + cvc5 --version - name: Prepare ccache uses: actions/cache@v2 with: diff --git a/.github/workflows/release-packages.yaml b/.github/workflows/release-packages.yaml index bc5a5f698f0..b284328c9eb 100644 --- a/.github/workflows/release-packages.yaml +++ b/.github/workflows/release-packages.yaml @@ -1,6 +1,8 @@ on: release: types: [created] +env: + cvc5-version: "0.0.9" name: Upload additional release assets jobs: @@ -18,6 +20,12 @@ jobs: sudo apt-get install --no-install-recommends -y g++ gdb flex bison cmake ninja-build maven jq libxml2-utils dpkg-dev ccache z3 - name: Confirm z3 solver is available and log the version installed run: z3 --version + - name: Download cvc-5 from the releases page and make sure it can be deployed + run: | + wget -O cvc5 https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux + chmod u+x cvc5 + mv cvc5 /usr/local/bin + cvc5 --version - name: Prepare ccache uses: actions/cache@v2 with: @@ -82,6 +90,12 @@ jobs: sudo apt-get install -y --allow-downgrades --reinstall gcc g++ libgcc-s1- libstdc++6=$target liblsan0=$target libtsan0=$target libcc1-0=$target libgcc1=1:$target gdb=8.1.1-0ubuntu1 - name: Confirm z3 solver is available and log the version installed run: z3 --version + - name: Download cvc-5 from the releases page and make sure it can be deployed + run: | + wget -O cvc5 https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux + chmod u+x cvc5 + mv cvc5 /usr/local/bin + cvc5 --version - name: Prepare ccache uses: actions/cache@v2 with: From b7c66928aeb90c91d64ff8a7db289e1638e886ca Mon Sep 17 00:00:00 2001 From: Michael Tautschnig Date: Fri, 8 Apr 2022 19:53:29 +0000 Subject: [PATCH 2/2] CI jobs: upgrade CVC5 to 1.0.0 CVC5 version 1 has been released on 2022-04-06. --- .github/workflows/pull-request-checks.yaml | 2 +- .github/workflows/release-packages.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-request-checks.yaml b/.github/workflows/pull-request-checks.yaml index e7fef9a91a9..05b07fba29a 100644 --- a/.github/workflows/pull-request-checks.yaml +++ b/.github/workflows/pull-request-checks.yaml @@ -3,7 +3,7 @@ on: pull_request: branches: [ develop ] env: - cvc5-version: "0.0.9" + cvc5-version: "1.0.0" jobs: check-ubuntu-20_04-make-gcc: diff --git a/.github/workflows/release-packages.yaml b/.github/workflows/release-packages.yaml index b284328c9eb..1da9d0a5c18 100644 --- a/.github/workflows/release-packages.yaml +++ b/.github/workflows/release-packages.yaml @@ -2,7 +2,7 @@ on: release: types: [created] env: - cvc5-version: "0.0.9" + cvc5-version: "1.0.0" name: Upload additional release assets jobs: