Skip to content

Commit 3002e79

Browse files
sobomaxarr2036
authored andcommitted
ubuntu-20.04 -> ubuntu-22.04.
Bump LLVM version to 18 and GCC to 13.
1 parent bac4a68 commit 3002e79

1 file changed

Lines changed: 25 additions & 17 deletions

File tree

.github/workflows/ci-linux.yml

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ jobs:
3535
fail-fast: false
3636
matrix:
3737
env:
38-
- { CC: gcc, OS: ubuntu-20.04, NAME: release-gcc, BUILD_TYPE: Release }
39-
- { CC: clang, OS: ubuntu-20.04, NAME: release-clang, BUILD_TYPE: Release }
40-
- { CC: musl-gcc, OS: ubuntu-20.04, NAME: release-musl-gcc, BUILD_TYPE: Release }
41-
- { CC: clang, OS: ubuntu-20.04, NAME: debug-asan, BUILD_TYPE: Debug, ENABLE_ASAN: YES, ENABLE_LSAN: YES, ENABLE_UBSAN: YES }
42-
- { CC: clang, OS: ubuntu-20.04, NAME: debug-tsan, BUILD_TYPE: Debug, ENABLE_TSAN: YES }
38+
- { CC: gcc, OS: ubuntu-22.04, NAME: release-gcc, BUILD_TYPE: Release }
39+
- { CC: clang, OS: ubuntu-22.04, NAME: release-clang, BUILD_TYPE: Release }
40+
- { CC: musl-gcc, OS: ubuntu-22.04, NAME: release-musl-gcc, BUILD_TYPE: Release }
41+
- { CC: clang, OS: ubuntu-22.04, NAME: debug-asan, BUILD_TYPE: Debug, ENABLE_ASAN: YES, ENABLE_LSAN: YES, ENABLE_UBSAN: YES }
42+
- { CC: clang, OS: ubuntu-22.04, NAME: debug-tsan, BUILD_TYPE: Debug, ENABLE_TSAN: YES }
4343
# Older kernel triggers a switch to posix/proc as it doesn't support pidfd.
44-
- { CC: clang, OS: ubuntu-18.04, NAME: debug-asan-posix-proc, BUILD_TYPE: Debug, ENABLE_ASAN: YES, ENABLE_LSAN: YES, ENABLE_UBSAN: YES }
45-
- { CC: clang, OS: ubuntu-18.04, NAME: debug-tsan-posix-proc, BUILD_TYPE: Debug, ENABLE_TSAN: YES }
44+
- { CC: clang, OS: ubuntu-24.04, NAME: debug-asan-posix-proc, BUILD_TYPE: Debug, ENABLE_ASAN: YES, ENABLE_LSAN: YES, ENABLE_UBSAN: YES }
45+
- { CC: clang, OS: ubuntu-24.04, NAME: debug-tsan-posix-proc, BUILD_TYPE: Debug, ENABLE_TSAN: YES }
4646

4747
runs-on: ${{ matrix.env.OS }}
4848

@@ -53,31 +53,39 @@ jobs:
5353
steps:
5454
- uses: actions/checkout@v2
5555

56+
- name: Set environment
57+
run: |
58+
sudo apt-get install -y --no-install-recommends curl gpg lsb-release
59+
MYREL="`lsb_release -c | grep ^Codename | awk '{print $2}'`"
60+
echo "CLANG_VER=18" >> ${GITHUB_ENV}
61+
echo "GCC_VER=13" >> ${GITHUB_ENV}
62+
echo "MYREL=${MYREL}" >> ${GITHUB_ENV}
63+
5664
- name: Add llvm source
57-
if: ${{ matrix.env.CC == 'clang' && matrix.env.OS == 'ubuntu-18.04' }}
65+
if: ${{ matrix.env.CC == 'clang' }}
5866
uses: myci-actions/add-deb-repo@10
5967
with:
60-
repo: deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main
68+
repo: deb http://apt.llvm.org/${{ env.MYREL }}/ llvm-toolchain-${{ env.MYREL }}-${{ env.CLANG_VER }} main
6169
repo-name: llvm-toolchain
6270
keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key
6371

6472
- name: Add GCC source
65-
if: ${{ matrix.env.CC == 'gcc' && matrix.env.OS == 'ubuntu-18.04' }}
73+
if: ${{ matrix.env.CC == 'gcc' }}
6674
run: |
6775
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
6876
69-
- name: Install LLVM 10
77+
- name: Install LLVM ${{ env.CLANG_VER }}
7078
if: ${{ matrix.env.CC == 'clang' }}
7179
run: |
72-
sudo apt-get install -y --no-install-recommends clang-10 llvm-10 gdb
73-
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-10 60 && sudo update-alternatives --set clang /usr/bin/clang-10
74-
sudo update-alternatives --install /usr/bin/llvm-symbolizer llvm-symbolizer /usr/bin/llvm-symbolizer-10 60 && sudo update-alternatives --set llvm-symbolizer /usr/bin/llvm-symbolizer-10
80+
sudo apt-get install -y --no-install-recommends clang-${{ env.CLANG_VER }} llvm-${{ env.CLANG_VER }} gdb libclang-rt-${{ env.CLANG_VER }}-dev
81+
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${{ env.CLANG_VER }} 60 && sudo update-alternatives --set clang /usr/bin/clang-${{ env.CLANG_VER }}
82+
sudo update-alternatives --install /usr/bin/llvm-symbolizer llvm-symbolizer /usr/bin/llvm-symbolizer-${{ env.CLANG_VER }} 60 && sudo update-alternatives --set llvm-symbolizer /usr/bin/llvm-symbolizer-${{ env.CLANG_VER }}
7583
76-
- name: Install GCC 7
84+
- name: Install GCC ${{ env.GCC_VER }}
7785
if: ${{ matrix.env.CC == 'gcc' }}
7886
run: |
79-
sudo apt-get install -y --no-install-recommends gcc-7 gccgo-7 gdb
80-
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 9999 && sudo update-alternatives --config gcc
87+
sudo apt-get install -y --no-install-recommends gcc-${{ env.GCC_VER }} gccgo-${{ env.GCC_VER }} gdb
88+
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ env.GCC_VER }} 9999 && sudo update-alternatives --config gcc
8189
8290
- name: Install MUSL
8391
if: ${{ matrix.env.CC == 'musl-gcc' }}

0 commit comments

Comments
 (0)