Skip to content

Commit bf58af8

Browse files
tautschnigtautschnig
authored
Merge pull request #8383 from tautschnig/upgrade-cvc5
CI jobs: upgrade CVC5 from 1.0.0 to 1.1.2
2 parents 3a0d39b + 3e38d2c commit bf58af8

File tree

3 files changed

+45
-41
lines changed

3 files changed

+45
-41
lines changed

‎.github/workflows/coverage.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
pull_request:
66
branches: [ develop ]
77
env:
8-
cvc5-version: "1.0.0"
8+
cvc5-version: "1.1.2"
99
linux-vcpus: 4
1010
windows-vcpus: 4
1111

@@ -36,9 +36,9 @@ jobs:
3636
run: z3 --version
3737
- name: Download cvc-5 from the releases page and make sure it can be deployed
3838
run: |
39-
wget -O cvc5 https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux
40-
chmod u+x cvc5
41-
mv cvc5 /usr/local/bin
39+
wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux-static.zip
40+
unzip -j -d /usr/local/bin cvc5-Linux-static.zip cvc5-Linux-static/bin/cvc5
41+
rm cvc5-Linux-static.zip
4242
cvc5 --version
4343
- name: Prepare ccache
4444
uses: actions/cache@v4

‎.github/workflows/pull-request-checks.yaml‎

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
pull_request:
66
branches: [ develop ]
77
env:
8-
cvc5-version: "1.0.0"
8+
cvc5-version: "1.1.2"
99
linux-vcpus: 4
1010
windows-vcpus: 4
1111

@@ -29,9 +29,9 @@ jobs:
2929
run: z3 --version
3030
- name: Download cvc-5 from the releases page and make sure it can be deployed
3131
run: |
32-
wget -O cvc5 https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux
33-
chmod u+x cvc5
34-
mv cvc5 /usr/local/bin
32+
wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux-static.zip
33+
unzip -j -d /usr/local/bin cvc5-Linux-static.zip cvc5-Linux-static/bin/cvc5
34+
rm cvc5-Linux-static.zip
3535
cvc5 --version
3636
- name: Prepare ccache
3737
uses: actions/cache@v4
@@ -115,9 +115,9 @@ jobs:
115115
run: z3 --version
116116
- name: Download cvc-5 from the releases page and make sure it can be deployed
117117
run: |
118-
wget -O cvc5 https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux
119-
chmod u+x cvc5
120-
mv cvc5 /usr/local/bin
118+
wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux-static.zip
119+
unzip -j -d /usr/local/bin cvc5-Linux-static.zip cvc5-Linux-static/bin/cvc5
120+
rm cvc5-Linux-static.zip
121121
cvc5 --version
122122
- name: Prepare ccache
123123
uses: actions/cache@v4
@@ -225,9 +225,9 @@ jobs:
225225
run: z3 --version
226226
- name: Download cvc-5 from the releases page and make sure it can be deployed
227227
run: |
228-
wget -O cvc5 https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux
229-
chmod u+x cvc5
230-
mv cvc5 /usr/local/bin
228+
wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux-static.zip
229+
unzip -j -d /usr/local/bin cvc5-Linux-static.zip cvc5-Linux-static/bin/cvc5
230+
rm cvc5-Linux-static.zip
231231
cvc5 --version
232232
- name: Prepare ccache
233233
uses: actions/cache@v4
@@ -297,9 +297,9 @@ jobs:
297297
run: z3 --version
298298
- name: Download cvc-5 from the releases page and make sure it can be deployed
299299
run: |
300-
wget -O cvc5 https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux
301-
chmod u+x cvc5
302-
mv cvc5 /usr/local/bin
300+
wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux-static.zip
301+
unzip -j -d /usr/local/bin cvc5-Linux-static.zip cvc5-Linux-static/bin/cvc5
302+
rm cvc5-Linux-static.zip
303303
cvc5 --version
304304
- name: Prepare ccache
305305
uses: actions/cache@v4
@@ -363,9 +363,9 @@ jobs:
363363
run: z3 --version
364364
- name: Download cvc-5 from the releases page and make sure it can be deployed
365365
run: |
366-
wget -O cvc5 https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux
367-
chmod u+x cvc5
368-
mv cvc5 /usr/local/bin
366+
wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux-static.zip
367+
unzip -j -d /usr/local/bin cvc5-Linux-static.zip cvc5-Linux-static/bin/cvc5
368+
rm cvc5-Linux-static.zip
369369
cvc5 --version
370370
- name: Prepare ccache
371371
uses: actions/cache@v4
@@ -423,9 +423,9 @@ jobs:
423423
run: z3 --version
424424
- name: Download cvc-5 from the releases page and make sure it can be deployed
425425
run: |
426-
wget -O cvc5 https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux
427-
chmod u+x cvc5
428-
mv cvc5 /usr/local/bin
426+
wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux-static.zip
427+
unzip -j -d /usr/local/bin cvc5-Linux-static.zip cvc5-Linux-static/bin/cvc5
428+
rm cvc5-Linux-static.zip
429429
cvc5 --version
430430
- name: Prepare ccache
431431
uses: actions/cache@v4
@@ -470,9 +470,9 @@ jobs:
470470
run: z3 --version
471471
- name: Download cvc-5 from the releases page and make sure it can be deployed
472472
run: |
473-
wget -O cvc5 https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux
474-
chmod u+x cvc5
475-
mv cvc5 /usr/local/bin
473+
wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux-static.zip
474+
unzip -j -d /usr/local/bin cvc5-Linux-static.zip cvc5-Linux-static/bin/cvc5
475+
rm cvc5-Linux-static.zip
476476
cvc5 --version
477477
- name: Prepare ccache
478478
uses: actions/cache@v4
@@ -600,9 +600,9 @@ jobs:
600600
run: z3 --version
601601
- name: Download cvc5 binary and make sure it can be deployed
602602
run: |
603-
curl -L https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-macOS --output cvc5
604-
chmod u+x cvc5
605-
mv cvc5 /usr/local/bin
603+
wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-macOS-static.zip
604+
unzip -j -d /usr/local/bin cvc5-macOS-static.zip cvc5-macOS-static/bin/cvc5
605+
rm cvc5-macOS-static.zip
606606
cvc5 --version
607607
- name: Prepare ccache
608608
uses: actions/cache@v4
@@ -652,9 +652,9 @@ jobs:
652652
run: z3 --version
653653
- name: Download cvc5 binary and make sure it can be deployed
654654
run: |
655-
curl -L https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-macOS --output cvc5
656-
chmod u+x cvc5
657-
mv cvc5 /usr/local/bin
655+
wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-macOS-static.zip
656+
unzip -j -d /usr/local/bin cvc5-macOS-static.zip cvc5-macOS-static/bin/cvc5
657+
rm cvc5-macOS-static.zip
658658
cvc5 --version
659659
- name: Prepare ccache
660660
uses: actions/cache@v4
@@ -708,7 +708,9 @@ jobs:
708708
Expand-Archive -LiteralPath '.\z3.Zip' -DestinationPath C:\tools
709709
echo "c:\tools\z3-4.8.10-x64-win\bin;" >> $env:GITHUB_PATH
710710
New-Item -ItemType directory "C:\tools\cvc5"
711-
Invoke-WebRequest -Uri https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Win64.exe -OutFile c:\tools\cvc5\cvc5.exe
711+
Invoke-WebRequest -Uri https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Win64-static.zip -OutFile .\cvc5-Win64-static.zip
712+
Expand-Archive -LiteralPath '.\cvc5-Win64-static.Zip'
713+
Move-Item -Path .\cvc5-Win64-static\cvc5-Win64-static\bin\cvc5.exe c:\tools\cvc5\cvc5.exe
712714
echo "c:\tools\cvc5;" >> $env:GITHUB_PATH
713715
- name: Confirm z3 solver is available and log the version installed
714716
run: z3 --version
@@ -769,7 +771,9 @@ jobs:
769771
Expand-Archive -LiteralPath '.\z3.Zip' -DestinationPath C:\tools
770772
echo "c:\tools\z3-4.8.10-x64-win\bin;" >> $env:GITHUB_PATH
771773
New-Item -ItemType directory "C:\tools\cvc5"
772-
wget.exe -O c:\tools\cvc5\cvc5.exe https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Win64.exe
774+
Invoke-WebRequest -Uri https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Win64-static.zip -OutFile .\cvc5-Win64-static.zip
775+
Expand-Archive -LiteralPath '.\cvc5-Win64-static.Zip'
776+
Move-Item -Path .\cvc5-Win64-static\cvc5-Win64-static\bin\cvc5.exe c:\tools\cvc5\cvc5.exe
773777
echo "c:\tools\cvc5;" >> $env:GITHUB_PATH
774778
New-Item -ItemType directory "C:\tools\parallel"
775779
wget.exe -O c:\tools\parallel\parallel https://git.savannah.gnu.org/cgit/parallel.git/plain/src/parallel

‎.github/workflows/release-packages.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ on:
22
release:
33
types: [created]
44
env:
5-
cvc5-version: "1.0.0"
5+
cvc5-version: "1.1.2"
66

77
name: Upload additional release assets
88
jobs:
@@ -22,9 +22,9 @@ jobs:
2222
run: z3 --version
2323
- name: Download cvc-5 from the releases page and make sure it can be deployed
2424
run: |
25-
wget -O cvc5 https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux
26-
chmod u+x cvc5
27-
mv cvc5 /usr/local/bin
25+
wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux-static.zip
26+
unzip -j -d /usr/local/bin cvc5-Linux-static.zip cvc5-Linux-static/bin/cvc5
27+
rm cvc5-Linux-static.zip
2828
cvc5 --version
2929
- name: Prepare ccache
3030
uses: actions/cache@v4
@@ -93,9 +93,9 @@ jobs:
9393
run: z3 --version
9494
- name: Download cvc-5 from the releases page and make sure it can be deployed
9595
run: |
96-
wget -O cvc5 https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux
97-
chmod u+x cvc5
98-
mv cvc5 /usr/local/bin
96+
wget https://github.com/cvc5/cvc5/releases/download/cvc5-${{env.cvc5-version}}/cvc5-Linux-static.zip
97+
unzip -j -d /usr/local/bin cvc5-Linux-static.zip cvc5-Linux-static/bin/cvc5
98+
rm cvc5-Linux-static.zip
9999
cvc5 --version
100100
- name: Prepare ccache
101101
uses: actions/cache@v4

0 commit comments

Comments
 (0)