Skip to content

Commit 2eb326d

Browse files
amai2012amai2012
authored
Update workflows to Ubuntu 20.04 (danmar#2948)
1 parent ecfabbc commit 2eb326d

File tree

8 files changed

+13
-35
lines changed

8 files changed

+13
-35
lines changed

‎.github/workflows/CI-unixish.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
104104
# Run self check after "Build GUI" to include generated headers in analysis
105105
- name: Self check
106-
if: matrix.os == 'ubuntu-18.04'
106+
if: matrix.os == 'ubuntu-20.04'
107107
run: |
108108
# compile with verification and ast matchers
109109
make clean
@@ -118,14 +118,14 @@ jobs:
118118
./cppcheck -q -j$(nproc) --template=gcc -D__CPPCHECK__ --error-exitcode=1 --inline-suppr --suppressions-list=.travis_suppressions --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2/ -Icli -Igui --inconclusive --enable=style,performance,portability,warning,internal --exception-handling test/*.cpp tools
119119
120120
- name: Build triage on ubuntu
121-
if: matrix.os == 'ubuntu-18.04'
121+
if: matrix.os == 'ubuntu-20.04'
122122
run: |
123123
pushd tools/triage
124124
qmake
125125
make -j$(nproc)
126126
127127
- name: Build Fuzzer
128-
if: matrix.os == 'ubuntu-18.04'
128+
if: matrix.os == 'ubuntu-20.04'
129129
run: |
130130
g++ -fsyntax-only -std=c++11 -Ilib oss-fuzz/*.cpp
131131

‎.github/workflows/asan.yml‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,7 @@ on: [push, pull_request]
77
jobs:
88
build:
99

10-
strategy:
11-
matrix:
12-
os: [ubuntu-latest]
13-
fail-fast: false # not worthwhile...
14-
15-
runs-on: ${{ matrix.os }}
10+
runs-on: ubuntu-20.04
1611

1712
steps:
1813
- uses: actions/checkout@v2
@@ -21,11 +16,9 @@ jobs:
2116
run: |
2217
sudo apt-get update
2318
sudo apt-get install libz3-4 libz3-dev
24-
cp externals/z3_version_old.h externals/z3_version.h
2519
2620
- name: Build
2721
run: |
28-
cp externals/z3_version_old.h externals/z3_version.h
2922
CC=clang CXX=clang++ CXXFLAGS="-fsanitize=address -O1 -g3 -DCPPCHK_GLIBCXX_DEBUG" make cppcheck testrunner -j$(nproc) USE_Z3=yes HAVE_RULES=yes MATCHCOMPILER=yes
3023
3124
- name: Run tests

‎.github/workflows/buildman.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [push, pull_request]
44

55
jobs:
66
convert_via_pandoc:
7-
runs-on: ubuntu-18.04
7+
runs-on: ubuntu-20.04
88
steps:
99
- uses: actions/checkout@v2
1010

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on: [push, pull_request]
55
jobs:
66
analyze:
77
name: Analyze
8-
runs-on: ubuntu-latest
8+
runs-on: ubuntu-20.04
99

1010
strategy:
1111
fail-fast: false
@@ -24,8 +24,7 @@ jobs:
2424
run: |
2525
sudo apt-get update
2626
sudo apt-get install libxml2-utils
27-
sudo apt-get install z3 libz3-dev
28-
cp externals/z3_version_old.h externals/z3_version.h
27+
sudo apt-get install libz3-dev libz3-4
2928
3029
# Initializes the CodeQL tools for scanning.
3130
- name: Initialize CodeQL

‎.github/workflows/coverage.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on: [push]
77
jobs:
88
build:
99

10-
runs-on: ubuntu-latest
10+
runs-on: ubuntu-20.04
1111

1212
steps:
1313
- uses: actions/checkout@v2
@@ -16,13 +16,12 @@ jobs:
1616
run: |
1717
sudo apt-get update
1818
sudo apt-get install libxml2-utils
19-
sudo apt-get install z3 libz3-dev
19+
sudo apt-get install libz3-dev libz3-4
2020
sudo apt-get install lcov
2121
pip install lcov_cobertura
2222
2323
- name: Compile instrumented
2424
run: |
25-
cp externals/z3_version_old.h externals/z3_version.h
2625
make test CXXFLAGS="-g -fprofile-arcs -ftest-coverage" USE_Z3=yes HAVE_RULES=yes -j$(nproc)
2726
2827
- name: Generate coverage report
@@ -35,7 +34,7 @@ jobs:
3534
lcov --extract lcov_tmp.info "$(pwd)/*" --output-file lcov.info
3635
genhtml lcov.info -o coverage_report --frame --legend --demangle-cpp
3736
38-
- uses: actions/upload-artifact@v1
37+
- uses: actions/upload-artifact@v2
3938
with:
4039
name: Coverage results
4140
path: coverage_report

‎.github/workflows/irc.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [pull_request, create]
44
jobs:
55
test:
66
if: github.repository == 'danmar/cppcheck'
7-
runs-on: ubuntu-latest
7+
runs-on: ubuntu-20.04
88
steps:
99
- name: irc pull request
1010
uses: rectalogic/notify-irc@v1

‎.github/workflows/scriptcheck.yml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,12 @@ on: [push, pull_request]
77
jobs:
88
build:
99

10-
strategy:
11-
matrix:
12-
os: [ubuntu-latest]
13-
fail-fast: false # not worthwhile...
14-
15-
runs-on: ${{ matrix.os }}
10+
runs-on: ubuntu-20.04
1611

1712
steps:
1813
- uses: actions/checkout@v2
1914

2015
- name: Install missing software on ubuntu
21-
if: matrix.os == 'ubuntu-latest'
2216
run: |
2317
sudo apt-get update
2418
sudo apt-get install shellcheck

‎.github/workflows/ubsan.yml‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,7 @@ on: [push, pull_request]
77
jobs:
88
build:
99

10-
strategy:
11-
matrix:
12-
os: [ubuntu-latest]
13-
fail-fast: false # not worthwhile...
14-
15-
runs-on: ${{ matrix.os }}
10+
runs-on: ubuntu-20.04
1611

1712
steps:
1813
- uses: actions/checkout@v2
@@ -21,11 +16,9 @@ jobs:
2116
run: |
2217
sudo apt-get update
2318
sudo apt-get install libz3-4 libz3-dev
24-
cp externals/z3_version_old.h externals/z3_version.h
2519
2620
- name: Build
2721
run: |
28-
cp externals/z3_version_old.h externals/z3_version.h
2922
CC=clang CXX=clang++ CXXFLAGS="-fsanitize=undefined -fsanitize=nullability -O1 -g3 -DCPPCHK_GLIBCXX_DEBUG" make cppcheck testrunner -j$(nproc) USE_Z3=yes HAVE_RULES=yes MATCHCOMPILER=yes
3023
3124
- name: Run tests

0 commit comments

Comments
 (0)