From 688de6f0938858c6e5bc9806f8f19919829c5733 Mon Sep 17 00:00:00 2001 From: serge-sans-paille Date: Tue, 8 Apr 2025 20:47:05 +0200 Subject: [PATCH] [ci] Move all runners to ubuntu-latest Also upgrade compiler version to use the one available on latest worker --- .github/workflows/cmake.yml | 2 +- .github/workflows/cross-rvv.yml | 2 +- .github/workflows/cross-sve.yml | 2 +- .github/workflows/cross.yml | 20 +----------- .github/workflows/emulated.yml | 11 +++---- .github/workflows/linux.yml | 57 +++++++++++++-------------------- 6 files changed, 30 insertions(+), 64 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 4bd2e7707..1df779b8e 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -8,7 +8,7 @@ defaults: shell: bash -l {0} jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Checkout xsimd uses: actions/checkout@v3 diff --git a/.github/workflows/cross-rvv.yml b/.github/workflows/cross-rvv.yml index f434147af..c4aef3678 100644 --- a/.github/workflows/cross-rvv.yml +++ b/.github/workflows/cross-rvv.yml @@ -7,7 +7,7 @@ env: GCC_VERSION: "12" jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest name: 'RISC-V RVV${{ matrix.vector_bits }}' strategy: matrix: diff --git a/.github/workflows/cross-sve.yml b/.github/workflows/cross-sve.yml index 7155ba4a6..4cd292f27 100644 --- a/.github/workflows/cross-sve.yml +++ b/.github/workflows/cross-sve.yml @@ -5,7 +5,7 @@ concurrency: cancel-in-progress: true jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest name: 'Arm SVE${{ matrix.vector_bits }}' strategy: matrix: diff --git a/.github/workflows/cross.yml b/.github/workflows/cross.yml index e0fbb33c2..071e85f25 100644 --- a/.github/workflows/cross.yml +++ b/.github/workflows/cross.yml @@ -14,26 +14,8 @@ jobs: - { platform: 'arm', arch: 'armv7-a', dir: 'arm-linux-gnueabihf', flags: '-mfpu=vfpv3-d16', full: 'OFF' } # no neon - { platform: 'aarch64', arch: 'armv8-a', dir: 'aarch64-linux-gnu', flags: '', full: 'ON' } sys: - - { compiler: 'gcc', version: '9' } -# - { compiler: 'clang', version: '17' } + - { compiler: 'gcc', version: '10' } steps: - - name: Setup compiler - if: ${{ matrix.sys.compiler == 'clang' }} - run: | - LLVM_VERSION=${{ matrix.sys.version }} - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - || exit 1 - if [[ $LLVM_VERSION -eq 'latest' ]]; then - sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal main" || exit 1 - else - sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-$LLVM_VERSION main" || exit 1 - fi - sudo apt-get update || exit 1 - if [[ $LLVM_VERSION -eq 'latest' ]]; then - sudo apt-get --no-install-suggests --no-install-recommends install clang || exit 1 - else - sudo apt-get --no-install-suggests --no-install-recommends install clang-$LLVM_VERSION || exit 1 - fi - sudo apt-get --no-install-suggests --no-install-recommends install g++-9-${{ matrix.target.dir }} g++-9-multilib || exit 1 - name: Setup compiler if: ${{ matrix.sys.compiler == 'gcc' }} run: | diff --git a/.github/workflows/emulated.yml b/.github/workflows/emulated.yml index b948074bd..df64cd2cd 100644 --- a/.github/workflows/emulated.yml +++ b/.github/workflows/emulated.yml @@ -8,13 +8,13 @@ defaults: shell: bash -l {0} jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest name: '${{ matrix.sys.compiler }} ${{ matrix.sys.version }} - emulated' strategy: matrix: sys: - - { compiler: 'gcc', version: '7'} - - { compiler: 'clang', version: '8'} + - { compiler: 'gcc', version: '12'} + - { compiler: 'clang', version: '16'} steps: - name: Setup compiler if: ${{ matrix.sys.compiler == 'gcc' }} @@ -32,12 +32,9 @@ jobs: if: ${{ matrix.sys.compiler == 'clang' }} run: | LLVM_VERSION=${{ matrix.sys.version }} - #sudo add-apt-repository ppa:ubuntu-toolchain-r/test || exit 1 - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - || exit 1 - sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal main" || exit 1 sudo apt-get update || exit 1 sudo apt-get --no-install-suggests --no-install-recommends install clang-$LLVM_VERSION || exit 1 - sudo apt-get --no-install-suggests --no-install-recommends install g++-9 g++-9-multilib || exit 1 + sudo apt-get --no-install-suggests --no-install-recommends install g++ g++-multilib || exit 1 sudo ln -s /usr/include/asm-generic /usr/include/asm CC=clang-$LLVM_VERSION echo "CC=$CC" >> $GITHUB_ENV diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 91703200c..94b4ddc45 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -8,42 +8,36 @@ defaults: shell: bash -l {0} jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest name: '${{ matrix.sys.compiler }} ${{ matrix.sys.version }} - ${{ matrix.sys.flags }}' strategy: matrix: sys: - - { compiler: 'gcc', version: '7', flags: 'force_no_instr_set' } - - { compiler: 'gcc', version: '8', flags: 'enable_xtl_complex' } - - { compiler: 'gcc', version: '9', flags: 'avx' } - #- { compiler: 'gcc', version: '10', flags: 'avx512' } buggy - - { compiler: 'gcc', version: '11', flags: 'avx512' } - - { compiler: 'gcc', version: '11', flags: 'i386' } - - { compiler: 'gcc', version: '11', flags: 'avx512pf' } - - { compiler: 'gcc', version: '11', flags: 'avx512vbmi' } - - { compiler: 'gcc', version: '11', flags: 'avx512vbmi2' } - - { compiler: 'gcc', version: '11', flags: 'avx512vnni' } - - { compiler: 'clang', version: '8', flags: 'force_no_instr_set' } - - { compiler: 'clang', version: '10', flags: 'enable_xtl_complex' } - - { compiler: 'clang', version: '12', flags: 'avx' } - - { compiler: 'clang', version: '13', flags: 'sse3' } - - { compiler: 'clang', version: '14', flags: 'avx512' } + - { compiler: 'gcc', version: '12', flags: 'force_no_instr_set' } + - { compiler: 'gcc', version: '13', flags: 'enable_xtl_complex' } + - { compiler: 'gcc', version: '14', flags: 'avx' } + - { compiler: 'gcc', version: '13', flags: 'avx512' } + - { compiler: 'gcc', version: '12', flags: 'i386' } + - { compiler: 'gcc', version: '13', flags: 'avx512pf' } + - { compiler: 'gcc', version: '13', flags: 'avx512vbmi' } + - { compiler: 'gcc', version: '14', flags: 'avx512vbmi2' } + - { compiler: 'gcc', version: '13', flags: 'avx512vnni' } + - { compiler: 'clang', version: '16', flags: 'force_no_instr_set' } + - { compiler: 'clang', version: '16', flags: 'enable_xtl_complex' } + - { compiler: 'clang', version: '17', flags: 'avx' } + - { compiler: 'clang', version: '17', flags: 'sse3' } + - { compiler: 'clang', version: '18', flags: 'avx512' } steps: - name: Setup compiler if: ${{ matrix.sys.compiler == 'gcc' }} run: | GCC_VERSION=${{ matrix.sys.version }} - if [[ $GCC_VERSION == '6' || $GCC_VERSION == '7' || $GCC_VERSION == '8' ]]; then - #sudo add-apt-repository ppa:ubuntu-toolchain-r/test - sudo apt-get update - sudo apt-get --no-install-suggests --no-install-recommends install g++-$GCC_VERSION - fi - if [[ '${{ matrix.sys.flags }}' -eq 'i386' ]]; then - sudo dpkg --add-architecture i386 - sudo add-apt-repository ppa:ubuntu-toolchain-r/test - sudo apt-get update - sudo apt-get --no-install-suggests --no-install-recommends install gcc-$GCC_VERSION-multilib g++-$GCC_VERSION-multilib linux-libc-dev:i386 - fi + sudo apt-get update + sudo apt-get --no-install-suggests --no-install-recommends install g++-$GCC_VERSION + sudo dpkg --add-architecture i386 + sudo add-apt-repository ppa:ubuntu-toolchain-r/test + sudo apt-get update + sudo apt-get --no-install-suggests --no-install-recommends install gcc-$GCC_VERSION-multilib g++-$GCC_VERSION-multilib linux-libc-dev:i386 CC=gcc-$GCC_VERSION echo "CC=$CC" >> $GITHUB_ENV CXX=g++-$GCC_VERSION @@ -52,16 +46,9 @@ jobs: if: ${{ matrix.sys.compiler == 'clang' }} run: | LLVM_VERSION=${{ matrix.sys.version }} - #sudo add-apt-repository ppa:ubuntu-toolchain-r/test || exit 1 - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - || exit 1 - if [[ $LLVM_VERSION -ge 13 ]]; then - sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-$LLVM_VERSION main" || exit 1 - else - sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal main" || exit 1 - fi || exit 1 sudo apt-get update || exit 1 sudo apt-get --no-install-suggests --no-install-recommends install clang-$LLVM_VERSION || exit 1 - sudo apt-get --no-install-suggests --no-install-recommends install g++-9 g++-9-multilib || exit 1 + sudo apt-get --no-install-suggests --no-install-recommends install g++ g++-multilib || exit 1 sudo ln -s /usr/include/asm-generic /usr/include/asm CC=clang-$LLVM_VERSION echo "CC=$CC" >> $GITHUB_ENV