Skip to content

Commit

Permalink
[ci] Update Linux CI to Ubuntu 24
Browse files Browse the repository at this point in the history
  • Loading branch information
@aaronj0
aaronj0 committed Aug 22, 2024
1 parent 5194327 commit 0fedf6b
Showing 1 changed file with 53 additions and 53 deletions.
106 changes: 53 additions & 53 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,37 +21,37 @@ jobs:
fail-fast: false
matrix:
include:
- name: ubu22-x86-gcc12-clang-repl-19
os: ubuntu-22.04
compiler: gcc-12
- name: ubu24-x86-gcc12-clang-repl-19
os: ubuntu-24.04
compiler: gcc-13
clang-runtime: '19'
cling: Off
cppyy: On
coverage: true
- name: ubu22-x86-gcc12-clang-repl-18
os: ubuntu-22.04
compiler: gcc-12
- name: ubu24-x86-gcc12-clang-repl-18
os: ubuntu-24.04
compiler: gcc-13
clang-runtime: '18'
cling: Off
cppyy: On
coverage: true
- name: ubu22-x86-gcc12-clang-repl-17
os: ubuntu-22.04
compiler: gcc-12
- name: ubu24-x86-gcc13-clang-repl-17
os: ubuntu-24.04
compiler: gcc-13
clang-runtime: '17'
cling: Off
cppyy: On
coverage: true
- name: ubu22-x86-gcc12-clang-repl-16
os: ubuntu-22.04
compiler: gcc-12
- name: ubu24-x86-gcc13-clang-repl-16
os: ubuntu-24.04
compiler: gcc-13
clang-runtime: '16'
cling: Off
cppyy: On
coverage: true
- name: ubu22-x86-gcc9-clang13-cling
os: ubuntu-22.04
compiler: gcc-9
- name: ubu24-x86-gcc13-clang13-cling
os: ubuntu-24.04
compiler: gcc-13
clang-runtime: '13'
cling: On
cling-version: '1.0'
Expand Down Expand Up @@ -318,10 +318,12 @@ jobs:
if: ${{ runner.os == 'Linux' && steps.cache.outputs.cache-hit != 'true' }}
run: |
# Install deps
sudo apt remove needrestart
sudo apt-get update
sudo apt-get install valgrind
sudo apt-get autoremove
sudo apt-get clean
- name: Install deps on MacOS
if: ${{ runner.os == 'macOS' && steps.cache.outputs.cache-hit != 'true' }}
Expand Down Expand Up @@ -494,35 +496,35 @@ jobs:
fail-fast: false
matrix:
include:
- name: ubu22-x86-gcc12-clang-repl-19-cppyy
os: ubuntu-22.04
compiler: gcc-12
- name: ubu24-x86-gcc13-clang-repl-19-cppyy
os: ubuntu-24.04
compiler: gcc-13
clang-runtime: '19'
cling: Off
cppyy: On
coverage: true
- name: ubu22-x86-gcc12-clang-repl-18-cppyy
os: ubuntu-22.04
compiler: gcc-12
- name: ubu24-x86-gcc12-clang-repl-18-cppyy
os: ubuntu-24.04
compiler: gcc-13
clang-runtime: '18'
cling: Off
cppyy: On
coverage: true
- name: ubu22-x86-gcc12-clang-repl-17-cppyy
os: ubuntu-22.04
compiler: gcc-12
- name: ubu24-x86-gcc13-clang-repl-17-cppyy
os: ubuntu-24.04
compiler: gcc-13
clang-runtime: '17'
cling: Off
cppyy: On
- name: ubu22-x86-gcc12-clang-repl-16-cppyy
os: ubuntu-22.04
compiler: gcc-12
- name: ubu24-x86-gcc13-clang-repl-16-cppyy
os: ubuntu-24.04
compiler: gcc-13
clang-runtime: '16'
cling: Off
cppyy: On
- name: ubu22-x86-gcc9-clang13-cling-cppyy
os: ubuntu-22.04
compiler: gcc-9
- name: ubu24-x86-gcc13-clang13-cling-cppyy
os: ubuntu-24.04
compiler: gcc-13
clang-runtime: '13'
cling: On
cling-version: '1.0'
Expand Down Expand Up @@ -793,7 +795,7 @@ jobs:
if: runner.os == 'Linux'
run: |
# Install deps
sudo apt-get update
sudo apt remove needrestart
sudo apt-get install git g++ debhelper devscripts gnupg python3
sudo apt-get install -y libc6-dbg
sudo snap install valgrind --classic
Expand Down Expand Up @@ -834,7 +836,7 @@ jobs:
- name: Setup code coverage
if: ${{ success() && (matrix.coverage == true) }}
run: |
sudo apt install lcov
sudo apt-get install -y lcov
echo "CODE_COVERAGE=1" >> $GITHUB_ENV
echo "BUILD_TYPE=Debug" >> $GITHUB_ENV
Expand Down Expand Up @@ -869,7 +871,6 @@ jobs:
-DBUILD_SHARED_LIBS=ON \
-DCODE_COVERAGE=${{ env.CODE_COVERAGE }} \
-DCMAKE_INSTALL_PREFIX=$CPPINTEROP_DIR \
-DLLVM_ENABLE_WERROR=On \
../
else
cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} \
Expand All @@ -880,7 +881,6 @@ jobs:
-DBUILD_SHARED_LIBS=ON \
-DCODE_COVERAGE=${{ env.CODE_COVERAGE }} \
-DCMAKE_INSTALL_PREFIX=$CPPINTEROP_DIR \
-DLLVM_ENABLE_WERROR=On \
../
fi
os="${{ matrix.os }}"
Expand Down Expand Up @@ -955,7 +955,6 @@ jobs:
-DUSE_REPL=OFF `
-DCling_DIR="$env:LLVM_BUILD_DIR\tools\cling" `
-DLLVM_DIR="$env:LLVM_BUILD_DIR" `
-DLLVM_ENABLE_WERROR=On `
-DClang_DIR="$env:LLVM_BUILD_DIR" -DCODE_COVERAGE=${{ env.CODE_COVERAGE }} -DCMAKE_INSTALL_PREFIX="$env:CPPINTEROP_DIR" ..\
}
else
Expand All @@ -964,7 +963,6 @@ jobs:
-DUSE_CLING=OFF `
-DUSE_REPL=ON `
-DLLVM_DIR="$env:LLVM_BUILD_DIR\lib\cmake\llvm" `
-DLLVM_ENABLE_WERROR=On `
-DClang_DIR="$env:LLVM_BUILD_DIR\lib\cmake\clang" -DCODE_COVERAGE=${{ env.CODE_COVERAGE }} -DCMAKE_INSTALL_PREFIX="$env:CPPINTEROP_DIR" ..\
}
cmake --build . --config ${{ env.BUILD_TYPE }} --target check-cppinterop --parallel ${{ env.ncpus }}
Expand Down Expand Up @@ -1015,6 +1013,9 @@ jobs:
run: |
python3 -m venv .venv
source .venv/bin/activate
python -m pip install --upgrade pip
pip install setuptools
pip install wheel
# Install CPyCppyy
git clone --depth=1 https://github.com/compiler-research/CPyCppyy.git
mkdir CPyCppyy/build
Expand All @@ -1034,7 +1035,7 @@ jobs:
# Install cppyy
git clone --depth=1 https://github.com/compiler-research/cppyy.git
cd cppyy
python -m pip install --upgrade . --no-deps
python -m pip install --upgrade . --no-deps --no-build-isolation
cd ..
- name: Run cppyy on Unix Systems
if: ${{ (runner.os != 'windows') && (matrix.cppyy == 'On') }}
Expand All @@ -1053,7 +1054,6 @@ jobs:
cd cppyy/test
echo ::group::Prepare For Testing
make all
python -m pip install --upgrade pip
python -m pip install pytest
python -m pip install pytest-xdist
python -m pip install numba
Expand Down Expand Up @@ -1125,33 +1125,33 @@ jobs:
fail-fast: false
matrix:
include:
- name: ubu22-x86-gcc12-clang-repl-19-emscripten_wasm
os: ubuntu-22.04
compiler: gcc-12
- name: ubu24-x86-gcc13-clang-repl-19-emscripten_wasm
os: ubuntu-24.04
compiler: gcc-13
clang-runtime: '19'
cling: Off
micromamba_shell_init: bash
- name: ubu22-x86-gcc12-clang-repl-18-emscripten_wasm
os: ubuntu-22.04
compiler: gcc-12
- name: ubu24-x86-gcc13-clang-repl-18-emscripten_wasm
os: ubuntu-24.04
compiler: gcc-13
clang-runtime: '18'
cling: Off
micromamba_shell_init: bash
- name: ubu22-x86-gcc12-clang-repl-17-emscripten_wasm
os: ubuntu-22.04
compiler: gcc-12
- name: ubu24-x86-gcc13-clang-repl-17-emscripten_wasm
os: ubuntu-24.04
compiler: gcc-13
clang-runtime: '17'
cling: Off
micromamba_shell_init: bash
- name: ubu22-x86-gcc12-clang-repl-16-emscripten_wasm
os: ubuntu-22.04
compiler: gcc-12
- name: ubu24-x86-gcc13-clang-repl-16-emscripten_wasm
os: ubuntu-24.04
compiler: gcc-13
clang-runtime: '16'
cling: Off
micromamba_shell_init: bash
- name: ubu22-x86-gcc9-clang13-cling-emscripten_wasm
os: ubuntu-22.04
compiler: gcc-9
- name: ubu24-x86-gcc13-clang13-cling-emscripten_wasm
os: ubuntu-24.04
compiler: gcc-13
clang-runtime: '13'
cling: On
cling-version: '1.0'
Expand Down

0 comments on commit 0fedf6b

Please sign in to comment.