Skip to content

Commit

Permalink
Merge pull request #173 from paulsengroup/ci/update
Browse files Browse the repository at this point in the history 
Update Docker images used by CI
  • Loading branch information
@robomics
robomics authored May 21, 2024
2 parents 4075162 + dfc02fe commit a019f1f
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 41 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/fuzzy-testing.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:
}

container:
image: ghcr.io/paulsengroup/ci-docker-images/ubuntu-22.04-cxx-clang-18
image: ghcr.io/paulsengroup/ci-docker-images/ubuntu-24.04-cxx-clang-18
options: "--user=root"

env:
Expand Down Expand Up @@ -152,7 +152,7 @@ jobs:
- name: Install Python
run: |
apt-get update
apt-get install -y python3.11 python3.11-dev
apt-get install -y python3.12 python3.12-dev
- name: Restore Conan cache
id: cache-conan
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run-clang-tidy.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
run-clang-tidy:
runs-on: ubuntu-latest
container:
image: ghcr.io/paulsengroup/ci-docker-images/ubuntu-22.04-cxx-clang-18
image: ghcr.io/paulsengroup/ci-docker-images/ubuntu-24.04-cxx-clang-18
options: '--user=root'

steps:
Expand Down
76 changes: 38 additions & 38 deletions .github/workflows/ubuntu-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,57 +71,57 @@ jobs:
var includes = []
// Debug builds (short CI)
includes.push({ compiler: 'gcc-8', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.1.*', build_type: 'Debug', developer_mode: 'OFF' })
includes.push({ compiler: 'gcc-14', os: 'ubuntu-24.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.1.*', build_type: 'Debug', developer_mode: 'ON' })
includes.push({ compiler: 'clang-8', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.1.*', build_type: 'Debug', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-18', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.1.*', build_type: 'Debug', developer_mode: 'ON' })
includes.push({ compiler: 'gcc-8', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Debug', developer_mode: 'OFF' })
includes.push({ compiler: 'gcc-14', os: 'ubuntu-24.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Debug', developer_mode: 'ON' })
includes.push({ compiler: 'clang-8', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Debug', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-18', os: 'ubuntu-24.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Debug', developer_mode: 'ON' })
// Release builds (short CI)
includes.push({ compiler: 'gcc-14', os: 'ubuntu-24.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.1.*', build_type: 'Release', developer_mode: 'ON' })
includes.push({ compiler: 'clang-18', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.1.*', build_type: 'Release', developer_mode: 'ON' })
includes.push({ compiler: 'gcc-14', os: 'ubuntu-24.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Release', developer_mode: 'ON' })
includes.push({ compiler: 'clang-18', os: 'ubuntu-24.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Release', developer_mode: 'ON' })
if (ci_short) {
return { include: includes }
}
// Debug builds (long CI)
includes.push({ compiler: 'gcc-9', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.28.*', conan: '2.1.*', build_type: 'Debug', developer_mode: 'OFF' })
includes.push({ compiler: 'gcc-10', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.28.*', conan: '2.1.*', build_type: 'Debug', developer_mode: 'OFF' })
includes.push({ compiler: 'gcc-11', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.28.*', conan: '2.1.*', build_type: 'Debug', developer_mode: 'OFF' })
includes.push({ compiler: 'gcc-12', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.28.*', conan: '2.1.*', build_type: 'Debug', developer_mode: 'OFF' })
includes.push({ compiler: 'gcc-13', os: 'ubuntu-24.04', generator: 'Ninja', cmake: '3.28.*', conan: '2.1.*', build_type: 'Debug', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-9', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.28.*', conan: '2.1.*', build_type: 'Debug', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-10', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.28.*', conan: '2.1.*', build_type: 'Debug', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-11', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.28.*', conan: '2.1.*', build_type: 'Debug', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-12', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.28.*', conan: '2.1.*', build_type: 'Debug', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-13', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.28.*', conan: '2.1.*', build_type: 'Debug', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-14', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.28.*', conan: '2.1.*', build_type: 'Debug', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-15', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.28.*', conan: '2.1.*', build_type: 'Debug', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-16', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.28.*', conan: '2.1.*', build_type: 'Debug', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-17', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.28.*', conan: '2.1.*', build_type: 'Debug', developer_mode: 'OFF' })
includes.push({ compiler: 'gcc-9', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Debug', developer_mode: 'OFF' })
includes.push({ compiler: 'gcc-10', os: 'ubuntu-24.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Debug', developer_mode: 'OFF' })
includes.push({ compiler: 'gcc-11', os: 'ubuntu-24.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Debug', developer_mode: 'OFF' })
includes.push({ compiler: 'gcc-12', os: 'ubuntu-24.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Debug', developer_mode: 'OFF' })
includes.push({ compiler: 'gcc-13', os: 'ubuntu-24.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Debug', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-9', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Debug', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-10', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Debug', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-11', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Debug', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-12', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Debug', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-13', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Debug', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-14', os: 'ubuntu-24.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Debug', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-15', os: 'ubuntu-24.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Debug', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-16', os: 'ubuntu-24.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Debug', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-17', os: 'ubuntu-24.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Debug', developer_mode: 'OFF' })
// Release builds (long CI)
includes.push({ compiler: 'gcc-8', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.28.*', conan: '2.1.*', build_type: 'Release', developer_mode: 'OFF' })
includes.push({ compiler: 'gcc-9', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.28.*', conan: '2.1.*', build_type: 'Release', developer_mode: 'OFF' })
includes.push({ compiler: 'gcc-10', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.28.*', conan: '2.1.*', build_type: 'Release', developer_mode: 'OFF' })
includes.push({ compiler: 'gcc-11', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.28.*', conan: '2.1.*', build_type: 'Release', developer_mode: 'OFF' })
includes.push({ compiler: 'gcc-12', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.28.*', conan: '2.1.*', build_type: 'Release', developer_mode: 'OFF' })
includes.push({ compiler: 'gcc-13', os: 'ubuntu-24.04', generator: 'Ninja', cmake: '3.28.*', conan: '2.1.*', build_type: 'Release', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-8', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.28.*', conan: '2.1.*', build_type: 'Release', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-9', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.28.*', conan: '2.1.*', build_type: 'Release', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-10', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.28.*', conan: '2.1.*', build_type: 'Release', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-11', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.28.*', conan: '2.1.*', build_type: 'Release', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-12', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.28.*', conan: '2.1.*', build_type: 'Release', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-13', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.28.*', conan: '2.1.*', build_type: 'Release', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-14', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.28.*', conan: '2.1.*', build_type: 'Release', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-15', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.28.*', conan: '2.1.*', build_type: 'Release', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-16', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.28.*', conan: '2.1.*', build_type: 'Release', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-17', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.28.*', conan: '2.1.*', build_type: 'Release', developer_mode: 'OFF' })
includes.push({ compiler: 'gcc-8', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Release', developer_mode: 'OFF' })
includes.push({ compiler: 'gcc-9', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Release', developer_mode: 'OFF' })
includes.push({ compiler: 'gcc-10', os: 'ubuntu-24.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Release', developer_mode: 'OFF' })
includes.push({ compiler: 'gcc-11', os: 'ubuntu-24.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Release', developer_mode: 'OFF' })
includes.push({ compiler: 'gcc-12', os: 'ubuntu-24.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Release', developer_mode: 'OFF' })
includes.push({ compiler: 'gcc-13', os: 'ubuntu-24.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Release', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-8', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Release', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-9', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Release', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-10', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Release', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-11', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Release', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-12', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Release', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-13', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Release', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-14', os: 'ubuntu-24.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Release', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-15', os: 'ubuntu-24.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Release', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-16', os: 'ubuntu-24.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Release', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-17', os: 'ubuntu-24.04', generator: 'Ninja', cmake: '3.29.*', conan: '2.3.*', build_type: 'Release', developer_mode: 'OFF' })
// Make sure project builds with CMake 3.25
includes.push({ compiler: 'clang-18', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.25.2', conan: '2.1.*', build_type: 'Release', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-18', os: 'ubuntu-24.04', generator: 'Ninja', cmake: '3.25.2', conan: '2.3.*', build_type: 'Release', developer_mode: 'OFF' })
// Make sure project builds with make
includes.push({ compiler: 'clang-18', os: 'ubuntu-22.04', generator: 'Unix Makefiles', cmake: '3.28.*', conan: '2.1.*', build_type: 'Release', developer_mode: 'OFF' })
includes.push({ compiler: 'clang-18', os: 'ubuntu-24.04', generator: 'Unix Makefiles', cmake: '3.29.*', conan: '2.3.*', build_type: 'Release', developer_mode: 'OFF' })
return { include: includes }
Expand Down

0 comments on commit a019f1f

Please sign in to comment.