Skip to content

Commit

Permalink
CI: Add gcc-14 and run on Ubuntu-24.04 (#61)
Browse files Browse the repository at this point in the history
  • Loading branch information
lukeshingles authored May 15, 2024
1 parent d64aae6 commit 595b941
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 52 deletions.
19 changes: 10 additions & 9 deletions .github/workflows/ci-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
cppcheck --force --language=c++ --std=c++20 --enable=style --suppress=knownConditionTrueFalse --check-level=exhaustive .
clang-format:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4

Expand Down Expand Up @@ -97,17 +97,17 @@ jobs:
run-clang-tidy
compile:
runs-on: ubuntu-22.04
env:
CXX: g++
strategy:
matrix:
compiler: [
{name: gcc, ver: 11},
{name: gcc, ver: 12},
{name: gcc, ver: 13},
# {name: gcc, ver: 14},
{name: nvc++, ver: '24.3'},
compiler:
[
{os: ubuntu-24.04, name: gcc, ver: 11},
{os: ubuntu-24.04, name: gcc, ver: 12},
{os: ubuntu-24.04, name: gcc, ver: 13},
{os: ubuntu-24.04, name: gcc, ver: 14},
{os: ubuntu-22.04, name: nvc++, ver: '24.3'},
]
mpi: [ON, OFF]
openmp: [ON, OFF]
Expand All @@ -117,6 +117,7 @@ jobs:
stdpar: ON
fail-fast: false

runs-on: ${{ matrix.compiler.os }}
name: ${{ matrix.compiler.name }} ${{ matrix.compiler.ver }}${{ matrix.mpi == 'ON' && ' MPI' || ''}}${{ matrix.openmp == 'ON' && ' OpenMP' || ''}}${{ matrix.stdpar == 'ON' && ' stdpar' || ''}}
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -181,7 +182,7 @@ jobs:
- name: install OpenMP
if: matrix.openmp == 'ON'
run: |
sudo apt-get install -y libomp5-14 libomp-dev
sudo apt-get install -y libomp5 libomp-dev
- name: Compile classic mode
run: |
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ jobs:
testmodels:
strategy:
matrix:
# os: ['ubuntu-latest', 'self-hosted']
os: [ubuntu-22.04]
os: [ubuntu-24.04]
testmode: [OFF, ON]
testname:
[
Expand Down Expand Up @@ -57,12 +56,12 @@ jobs:
# sudo add-apt-repository multiverse
sudo apt-get update
- name: Install gcc-13
- name: Install gcc-14
if: always()
uses: fortran-lang/setup-fortran@v1
with:
compiler: gcc
version: 13
version: 14

- name: install gsl and openmpi
run: |
Expand Down Expand Up @@ -297,7 +296,7 @@ jobs:
combine_checksums:
needs: testmodels
if: always()
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Download test output
uses: actions/download-artifact@v4
Expand Down
42 changes: 21 additions & 21 deletions tests/classicmode_1d_3dgrid_inputfiles/results_md5_final.txt
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
24109f2d09a0dc6f111430bcac62e362 absorption.out
f99d272a5701a67ddbdbe3cc572dfdc0 absorptionpol.out
50ef16bf43784e7f8dfbe2f6c285bc0a absorption.out
1a9d7d912bdc103a43b378b90e24c4ba absorptionpol.out
c0604236aa7df99cda43e5c7bbe7b6f4 bflist.out
b9494795649e4c892a5864e1364702ac deposition.out
b235a725a159945147f84384a1295123 emission.out
32a92ebc53f27d5a549d9242cf9ff7a8 emissionpol.out
5c07db44ce0f562f0e7f67202df5ae46 emissiontrue.out
638daf26cdb4249c06fb4475f4f2b078 gamma_light_curve.out
93a975936b353d1f78f275229cdb2a28 gamma_spec.out
fc4fc40330c7ecf916358cc744c422f3 deposition.out
fef7cc28820f477dd111d905a7cbdf5a emission.out
ca589bac83866a9479519cab74f31a09 emissionpol.out
21a1f61ef79299c43761614d097584b6 emissiontrue.out
1c8f43523a8bf1e24cd24db7f256701f gamma_light_curve.out
0c2a7f61dce00daa1da52a3085c41224 gamma_spec.out
057b226c371f3819cba5e04bfea3d114 gammalinelist.out
20bddb22b6f084a7abc105c210366bfd grid.out
281553bd29e414420511af82b97c2ba2 light_curve.out
2918754ae0ca07ebba74ad8a148646ee light_curve.out
5740f40190d45653e5fce57ddf577dc8 linestat.out
c4e4e8d00846618f3931dc01cf52615f modelgridrankassignments.out
d6e3ae254d56e6649c2ea35a81437beb packets00_0000.out
6f6af500b379fdef6c04e2e480d0293a packets00_0001.out
887fe3ebcd66343afa8d283ca8289a0d spec.out
08b4509cde05029747a3015743b0be9b specpol.out
58fbae3d776d484d27cc7adb4d63d909 packets00_0000.out
fd81df81ec3fa4fbab5924f2892e59b4 packets00_0001.out
454b13ad8770380932e05e51bea9b9dc spec.out
ed8e92aa9a5d0d3717f697c967a35245 specpol.out
040c71f981716a2abf0467a82b1ac13c timesteps.out
f68f74909b936eee297339b84c11a411 vpackets_0000.out
076d636099699acb8c38a978771673eb vpackets_0001.out
45d2451baa526cfe6789594cfedaf19e vpkt_grid_0000.out
9261e4760253227d7856d16989573a52 vpkt_grid_0001.out
96ae0b30d1315ec67794c399f350636f vspecpol_0000.out
1b1c71cbc0616c3c09527702cea59e58 vspecpol_0001.out
758593c9177b6eefb1a8e25d7a64752b job1/estimators_0000.out
0c75c9ce7960ee93ed3ec63c2373867d job1/estimators_0001.out
508619acff2a825d7e3ce9a7536d2371 vpackets_0000.out
8be926090f01f929ef2f620a119db621 vpackets_0001.out
49214f0ff96736c807dfada58cd31f63 vpkt_grid_0000.out
aee10c0ea4c9070a6a99371e738cf1d0 vpkt_grid_0001.out
a5df7ee0f2b64fc14298b71f1c69a357 vspecpol_0000.out
1ea589c07198665405b2d037c104ad0f vspecpol_0001.out
1289d2c8180a1b1d0fbee86b07b97501 job1/estimators_0000.out
44aef2b4c845f2d5887c4949eca08a28 job1/estimators_0001.out
34 changes: 17 additions & 17 deletions tests/classicmode_1d_3dgrid_inputfiles/results_md5_job0.txt
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
11f8f93d7c842db7db27b2b3265af6ea absorption.out
e4646572d4363ee5a68fd32f5675ee3d absorption.out
c0604236aa7df99cda43e5c7bbe7b6f4 bflist.out
5821d8a1ff0e633054b15e18e2ed98a6 deposition.out
274829c7939376eb1d5824c28b4be191 emission.out
4502ee9ed52ebfe8c4ed554ac0c54904 emissiontrue.out
907d274bcb2fe45a98e61d1c33d5ee3c gamma_light_curve.out
f3ee8a098c1131d1d5cf93e9fe0419d4 deposition.out
424f2177270e1ae0fb9622abaf6aec7d emission.out
5733cf949317613cbf531555c99a6b32 emissiontrue.out
522da47e6fee67deaa4f70f4c864810a gamma_light_curve.out
057b226c371f3819cba5e04bfea3d114 gammalinelist.out
20bddb22b6f084a7abc105c210366bfd grid.out
01ed85b14e70a20006471e4234bd469b light_curve.out
a232896ac6ec44efdb9acee4a01e93c9 light_curve.out
5740f40190d45653e5fce57ddf577dc8 linestat.out
c4e4e8d00846618f3931dc01cf52615f modelgridrankassignments.out
4ad371d778ec13591ade5b3cf859b581 packets00_0000.out
e50e0a0eb82da388d06a8548d893bdd9 packets00_0001.out
8ceb17de8e2794690301d502e0481204 spec.out
f5b346a235e97a802d4e8d21e078e025 packets00_0000.out
5039410ad2cfa41ec045723dae3c5ee0 packets00_0001.out
04b50cea1d7f9b69969dfdb295124409 spec.out
040c71f981716a2abf0467a82b1ac13c timesteps.out
037cf46f584136c4eec9ac53ac0c451b vpackets_0000.out
1a942d94eb24e02f4f256e2aaf37584a vpackets_0001.out
f5a912bb7c2d575104f1be55e38e6656 vpkt_grid_0000.out
37def760441c053b4f50eb64c762faff vpkt_grid_0001.out
2553cd0edfc684028256324699c6cbf7 vspecpol_0000.out
2e22b9de9ca662fb1ad6e61ce8e666a6 vspecpol_0001.out
411894f38788c399279a3f2ccc2e2e39 job0/estimators_0000.out
264522adaa97be92359332b789aa21e3 job0/estimators_0001.out
edcc1eae5209d0cc50a08a9bc42411da vpackets_0000.out
8c941b0f8c1e9a51918ed7ecdc7c11ab vpackets_0001.out
16ce0ec48c62157a52752753f68e0c24 vpkt_grid_0000.out
12f46741e9a74403500c5851a02241c5 vpkt_grid_0001.out
61c709d5a671fe70707166f4c921a7a4 vspecpol_0000.out
ccb4805fe732dd03f860708de0bc34ef vspecpol_0001.out
dd193ed41652ff3db05a5c413a1af950 job0/estimators_0000.out
cfbf940c24b6696c4d28d2504a3cbfc0 job0/estimators_0001.out

0 comments on commit 595b941

Please sign in to comment.