Skip to content

Commit 7ba60a1

Browse files
committed
CI: replace Ubuntu 18.04 with Ubuntu 20.04
Ubuntu 18.04 reached EOL this spring, the CI images are deprecated and they will be removed soon. See: actions/runner-images#6002
1 parent 9f94299 commit 7ba60a1

File tree

1 file changed

+9
-23
lines changed

1 file changed

+9
-23
lines changed

.github/workflows/linux.yml

+9-23
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
matrix:
1717
include:
1818
# Linux with GCC
19-
- {os: ubuntu-18.04, llvm: '6.0', compiler: gcc}
20-
- {os: ubuntu-18.04, llvm: 7, compiler: gcc}
21-
- {os: ubuntu-18.04, llvm: 8, compiler: gcc}
22-
- {os: ubuntu-18.04, llvm: 9, compiler: gcc}
19+
- {os: ubuntu-20.04, llvm: '6.0', compiler: gcc}
20+
- {os: ubuntu-20.04, llvm: 7, compiler: gcc}
21+
- {os: ubuntu-20.04, llvm: 8, compiler: gcc}
22+
- {os: ubuntu-20.04, llvm: 9, compiler: gcc}
2323
- {os: ubuntu-20.04, llvm: 10, compiler: gcc}
2424
- {os: ubuntu-20.04, llvm: 10, compiler: gcc, type: Debug}
2525
# FIXME: Edit when KLEE is rebased to latest upstream.
@@ -28,10 +28,10 @@ jobs:
2828
- {os: ubuntu-22.04, llvm: 13, compiler: gcc, klee: 'no-klee'}
2929

3030
# Linux with Clang
31-
- {os: ubuntu-18.04, llvm: '6.0', compiler: clang}
32-
- {os: ubuntu-18.04, llvm: 7, compiler: clang}
33-
- {os: ubuntu-18.04, llvm: 8, compiler: clang}
34-
- {os: ubuntu-18.04, llvm: 9, compiler: clang}
31+
- {os: ubuntu-20.04, llvm: '6.0', compiler: clang}
32+
- {os: ubuntu-20.04, llvm: 7, compiler: clang}
33+
- {os: ubuntu-20.04, llvm: 8, compiler: clang}
34+
- {os: ubuntu-20.04, llvm: 9, compiler: clang}
3535
- {os: ubuntu-20.04, llvm: 10, compiler: clang}
3636
- {os: ubuntu-20.04, llvm: 10, compiler: clang, type: Debug}
3737
# FIXME: Edit when KLEE is rebased to latest upstream.
@@ -46,18 +46,6 @@ jobs:
4646
with:
4747
submodules: true
4848

49-
# LLVM 7.0.x built by GCC is not ABI compatible with tools built by Clang
50-
# and vice-versa. Therefore, every instance of KLEE ended being killed
51-
# by SIGSEGV. LLVM 7.1 fixes this issue but it never made its way to
52-
# Bionic's official repositories. So let's use the LLVM repos instead.
53-
#
54-
# https://lists.llvm.org/pipermail/llvm-dev/2018-September/126564.html
55-
- name: '[Bionic + LLVM 7.1] Add repositories'
56-
if: matrix.os == 'ubuntu-18.04' && matrix.llvm == 7
57-
run: |
58-
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
59-
sudo apt-add-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-7 main"
60-
6149
- name: Install dependencies
6250
run: |
6351
sudo apt update
@@ -123,9 +111,7 @@ jobs:
123111
sudo /usr/sbin/update-ccache-symlinks
124112
echo "/usr/lib/ccache" >> $GITHUB_PATH
125113
126-
# Bionic does not create symlinks to versioned clang
127-
sudo ln -sfr /usr/bin/ccache /usr/lib/ccache/clang-${{matrix.llvm}}
128-
sudo ln -sfr /usr/bin/ccache /usr/lib/ccache/clang++-${{matrix.llvm}}
114+
# Store the environment
129115
echo "CCACHE_BASEDIR=$GITHUB_WORKSPACE" >> $GITHUB_ENV
130116
echo "CCACHE_COMPRESS=true" >> $GITHUB_ENV
131117
echo "CCACHE_COMPRESSLEVEL=6" >> $GITHUB_ENV

0 commit comments

Comments
 (0)