Skip to content

Commit e4f0f96

Browse files
serge-sans-pailleserge-sans-paille
committed
[ci] Move all runners to ubuntu-latest
Also upgrade compiler version to use the one available on latest worker
1 parent 4b182f4 commit e4f0f96

File tree

6 files changed

+30
-64
lines changed

6 files changed

+30
-64
lines changed

‎.github/workflows/cmake.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ defaults:
88
shell: bash -l {0}
99
jobs:
1010
build:
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout xsimd
1414
uses: actions/checkout@v3

‎.github/workflows/cross-rvv.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ env:
77
GCC_VERSION: "12"
88
jobs:
99
build:
10-
runs-on: ubuntu-22.04
10+
runs-on: ubuntu-latest
1111
name: 'RISC-V RVV${{ matrix.vector_bits }}'
1212
strategy:
1313
matrix:

‎.github/workflows/cross-sve.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ concurrency:
55
cancel-in-progress: true
66
jobs:
77
build:
8-
runs-on: ubuntu-20.04
8+
runs-on: ubuntu-latest
99
name: 'Arm SVE${{ matrix.vector_bits }}'
1010
strategy:
1111
matrix:

‎.github/workflows/cross.yml‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,8 @@ jobs:
1414
- { platform: 'arm', arch: 'armv7-a', dir: 'arm-linux-gnueabihf', flags: '-mfpu=vfpv3-d16', full: 'OFF' } # no neon
1515
- { platform: 'aarch64', arch: 'armv8-a', dir: 'aarch64-linux-gnu', flags: '', full: 'ON' }
1616
sys:
17-
- { compiler: 'gcc', version: '9' }
18-
# - { compiler: 'clang', version: '17' }
17+
- { compiler: 'gcc', version: '10' }
1918
steps:
20-
- name: Setup compiler
21-
if: ${{ matrix.sys.compiler == 'clang' }}
22-
run: |
23-
LLVM_VERSION=${{ matrix.sys.version }}
24-
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - || exit 1
25-
if [[ $LLVM_VERSION -eq 'latest' ]]; then
26-
sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal main" || exit 1
27-
else
28-
sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-$LLVM_VERSION main" || exit 1
29-
fi
30-
sudo apt-get update || exit 1
31-
if [[ $LLVM_VERSION -eq 'latest' ]]; then
32-
sudo apt-get --no-install-suggests --no-install-recommends install clang || exit 1
33-
else
34-
sudo apt-get --no-install-suggests --no-install-recommends install clang-$LLVM_VERSION || exit 1
35-
fi
36-
sudo apt-get --no-install-suggests --no-install-recommends install g++-9-${{ matrix.target.dir }} g++-9-multilib || exit 1
3719
- name: Setup compiler
3820
if: ${{ matrix.sys.compiler == 'gcc' }}
3921
run: |

‎.github/workflows/emulated.yml‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ defaults:
88
shell: bash -l {0}
99
jobs:
1010
build:
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-latest
1212
name: '${{ matrix.sys.compiler }} ${{ matrix.sys.version }} - emulated'
1313
strategy:
1414
matrix:
1515
sys:
16-
- { compiler: 'gcc', version: '7'}
17-
- { compiler: 'clang', version: '8'}
16+
- { compiler: 'gcc', version: '12'}
17+
- { compiler: 'clang', version: '16'}
1818
steps:
1919
- name: Setup compiler
2020
if: ${{ matrix.sys.compiler == 'gcc' }}
@@ -32,12 +32,9 @@ jobs:
3232
if: ${{ matrix.sys.compiler == 'clang' }}
3333
run: |
3434
LLVM_VERSION=${{ matrix.sys.version }}
35-
#sudo add-apt-repository ppa:ubuntu-toolchain-r/test || exit 1
36-
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - || exit 1
37-
sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal main" || exit 1
3835
sudo apt-get update || exit 1
3936
sudo apt-get --no-install-suggests --no-install-recommends install clang-$LLVM_VERSION || exit 1
40-
sudo apt-get --no-install-suggests --no-install-recommends install g++-9 g++-9-multilib || exit 1
37+
sudo apt-get --no-install-suggests --no-install-recommends install g++ g++-multilib || exit 1
4138
sudo ln -s /usr/include/asm-generic /usr/include/asm
4239
CC=clang-$LLVM_VERSION
4340
echo "CC=$CC" >> $GITHUB_ENV

‎.github/workflows/linux.yml‎

Lines changed: 22 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -8,42 +8,36 @@ defaults:
88
shell: bash -l {0}
99
jobs:
1010
build:
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-latest
1212
name: '${{ matrix.sys.compiler }} ${{ matrix.sys.version }} - ${{ matrix.sys.flags }}'
1313
strategy:
1414
matrix:
1515
sys:
16-
- { compiler: 'gcc', version: '7', flags: 'force_no_instr_set' }
17-
- { compiler: 'gcc', version: '8', flags: 'enable_xtl_complex' }
18-
- { compiler: 'gcc', version: '9', flags: 'avx' }
19-
#- { compiler: 'gcc', version: '10', flags: 'avx512' } buggy
20-
- { compiler: 'gcc', version: '11', flags: 'avx512' }
21-
- { compiler: 'gcc', version: '11', flags: 'i386' }
22-
- { compiler: 'gcc', version: '11', flags: 'avx512pf' }
23-
- { compiler: 'gcc', version: '11', flags: 'avx512vbmi' }
24-
- { compiler: 'gcc', version: '11', flags: 'avx512vbmi2' }
25-
- { compiler: 'gcc', version: '11', flags: 'avx512vnni' }
26-
- { compiler: 'clang', version: '8', flags: 'force_no_instr_set' }
27-
- { compiler: 'clang', version: '10', flags: 'enable_xtl_complex' }
28-
- { compiler: 'clang', version: '12', flags: 'avx' }
29-
- { compiler: 'clang', version: '13', flags: 'sse3' }
30-
- { compiler: 'clang', version: '14', flags: 'avx512' }
16+
- { compiler: 'gcc', version: '12', flags: 'force_no_instr_set' }
17+
- { compiler: 'gcc', version: '13', flags: 'enable_xtl_complex' }
18+
- { compiler: 'gcc', version: '14', flags: 'avx' }
19+
- { compiler: 'gcc', version: '13', flags: 'avx512' }
20+
- { compiler: 'gcc', version: '12', flags: 'i386' }
21+
- { compiler: 'gcc', version: '13', flags: 'avx512pf' }
22+
- { compiler: 'gcc', version: '13', flags: 'avx512vbmi' }
23+
- { compiler: 'gcc', version: '14', flags: 'avx512vbmi2' }
24+
- { compiler: 'gcc', version: '13', flags: 'avx512vnni' }
25+
- { compiler: 'clang', version: '16', flags: 'force_no_instr_set' }
26+
- { compiler: 'clang', version: '16', flags: 'enable_xtl_complex' }
27+
- { compiler: 'clang', version: '17', flags: 'avx' }
28+
- { compiler: 'clang', version: '17', flags: 'sse3' }
29+
- { compiler: 'clang', version: '18', flags: 'avx512' }
3130
steps:
3231
- name: Setup compiler
3332
if: ${{ matrix.sys.compiler == 'gcc' }}
3433
run: |
3534
GCC_VERSION=${{ matrix.sys.version }}
36-
if [[ $GCC_VERSION == '6' || $GCC_VERSION == '7' || $GCC_VERSION == '8' ]]; then
37-
#sudo add-apt-repository ppa:ubuntu-toolchain-r/test
38-
sudo apt-get update
39-
sudo apt-get --no-install-suggests --no-install-recommends install g++-$GCC_VERSION
40-
fi
41-
if [[ '${{ matrix.sys.flags }}' -eq 'i386' ]]; then
42-
sudo dpkg --add-architecture i386
43-
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
44-
sudo apt-get update
45-
sudo apt-get --no-install-suggests --no-install-recommends install gcc-$GCC_VERSION-multilib g++-$GCC_VERSION-multilib linux-libc-dev:i386
46-
fi
35+
sudo apt-get update
36+
sudo apt-get --no-install-suggests --no-install-recommends install g++-$GCC_VERSION
37+
sudo dpkg --add-architecture i386
38+
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
39+
sudo apt-get update
40+
sudo apt-get --no-install-suggests --no-install-recommends install gcc-$GCC_VERSION-multilib g++-$GCC_VERSION-multilib linux-libc-dev:i386
4741
CC=gcc-$GCC_VERSION
4842
echo "CC=$CC" >> $GITHUB_ENV
4943
CXX=g++-$GCC_VERSION
@@ -52,16 +46,9 @@ jobs:
5246
if: ${{ matrix.sys.compiler == 'clang' }}
5347
run: |
5448
LLVM_VERSION=${{ matrix.sys.version }}
55-
#sudo add-apt-repository ppa:ubuntu-toolchain-r/test || exit 1
56-
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - || exit 1
57-
if [[ $LLVM_VERSION -ge 13 ]]; then
58-
sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-$LLVM_VERSION main" || exit 1
59-
else
60-
sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal main" || exit 1
61-
fi || exit 1
6249
sudo apt-get update || exit 1
6350
sudo apt-get --no-install-suggests --no-install-recommends install clang-$LLVM_VERSION || exit 1
64-
sudo apt-get --no-install-suggests --no-install-recommends install g++-9 g++-9-multilib || exit 1
51+
sudo apt-get --no-install-suggests --no-install-recommends install g++ g++-multilib || exit 1
6552
sudo ln -s /usr/include/asm-generic /usr/include/asm
6653
CC=clang-$LLVM_VERSION
6754
echo "CC=$CC" >> $GITHUB_ENV

0 commit comments

Comments
 (0)