From 969d471d1b8426c511a7587756a302b77bc22971 Mon Sep 17 00:00:00 2001 From: Julien Schueller Date: Fri, 29 Dec 2023 16:34:47 +0100 Subject: [PATCH] release --- .github/workflows/cmake.yml | 53 +++++++++++++------------------------ 1 file changed, 18 insertions(+), 35 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index c90b563093..244f2ca0de 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -32,7 +32,7 @@ jobs: # See https://github.com/fortran-lang/setup-fortran?tab=readme-ov-file#runner-compatibility # for the toolchains provided by fortran-lang/setup-fortran. We test the latest three on each OS. # First define the toolchains on Linux and macOS. - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest] toolchain: - {compiler: gcc, version: 11, cflags: '-Wall -Wextra -Wpedantic -Werror', fflags: '-Wall -Wextra -Wpedantic -Werror -fimplicit-none -frecursive -fcheck=all -fstack-check -Wno-function-elimination', generator: 'Ninja'} - {compiler: gcc, version: 12, cflags: '-Wall -Wextra -Wpedantic -Werror', fflags: '-Wall -Wextra -Wpedantic -Werror -fimplicit-none -frecursive -fcheck=all -fstack-check -Wno-function-elimination', generator: 'Ninja'} @@ -42,41 +42,24 @@ jobs: - {compiler: intel-classic, version: '2021.9', cflags: '-diag-disable=10441', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion', generator: 'Ninja'} include: - # intel compiler (ifx) does not support macOS. So they are not included above but below. - - os: ubuntu-latest - toolchain: {compiler: intel, version: '2023.0', cflags: '', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion', generator: 'Ninja'} - - os: ubuntu-latest - toolchain: {compiler: intel, version: '2023.1', cflags: '', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion', generator: 'Ninja'} - - os: ubuntu-latest - toolchain: {compiler: intel, version: '2023.2', cflags: '', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion', generator: 'Ninja'} - - # What follows contains the toolchains for Windows, including gcc, intel classic, and intel. - - os: windows-latest - toolchain: {compiler: gcc, version: 11, cflags: '-Wall -Wextra -Wpedantic -Werror', fflags: '-Wall -Wextra -Wpedantic -Werror -fimplicit-none -frecursive -fcheck=all -fstack-check -Wno-function-elimination', generator: 'Ninja'} - - os: windows-latest - toolchain: {compiler: gcc, version: 12, cflags: '-Wall -Wextra -Wpedantic -Werror', fflags: '-Wall -Wextra -Wpedantic -Werror -fimplicit-none -frecursive -fcheck=all -fstack-check -Wno-function-elimination', generator: 'Ninja'} - - os: windows-latest - toolchain: {compiler: gcc, version: 13, cflags: '-Wall -Wextra -Wpedantic -Werror', fflags: '-Wall -Wextra -Wpedantic -Werror -fimplicit-none -frecursive -fcheck=all -fstack-check -Wno-function-elimination', generator: 'Ninja'} - - os: windows-latest - toolchain: {compiler: intel, version: '2023.0', cflags: '', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', generator: 'Ninja'} - - os: windows-latest - toolchain: {compiler: intel, version: '2023.1', cflags: '', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', generator: 'Ninja'} - os: windows-latest toolchain: {compiler: intel, version: '2023.2', cflags: '', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', generator: 'Ninja'} - os: windows-latest toolchain: {compiler: intel, version: '2023.2', cflags: '', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', cc: cl, generator: 'Ninja'} - os: windows-latest - toolchain: {compiler: intel, version: '2023.2', cflags: '', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', cc: cl, generator: 'Visual Studio 17 2022'} - - os: windows-latest - toolchain: {compiler: intel-classic, version: '2021.7', cflags: '/Qdiag-disable:10441', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', generator: 'Ninja'} + toolchain: {compiler: intel, version: '2023.2', cflags: '', fflags: '', cc: cl, generator: 'Visual Studio 17 2022'} - os: windows-latest - toolchain: {compiler: intel-classic, version: '2021.8', cflags: '/Qdiag-disable:10441', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', generator: 'Ninja'} - - os: windows-latest - toolchain: {compiler: intel-classic, version: '2021.9', cflags: '/Qdiag-disable:10441', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', generator: 'Ninja'} - - os: windows-latest - toolchain: {compiler: intel-classic, version: '2021.9', cflags: '/Qdiag-disable:10441', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', cc: cl, generator: 'Ninja'} - - os: windows-latest - toolchain: {compiler: intel-classic, version: '2021.9', cflags: '', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', cc: cl, generator: 'Visual Studio 17 2022'} + toolchain: {compiler: intel, version: '2023.2', cflags: '', fflags: '', cc: cl, generator: 'NMake Makefiles'} + # - os: windows-latest + # toolchain: {compiler: intel-classic, version: '2021.7', cflags: '/Qdiag-disable:10441', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', generator: 'Ninja'} + # - os: windows-latest + # toolchain: {compiler: intel-classic, version: '2021.8', cflags: '/Qdiag-disable:10441', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', generator: 'Ninja'} + # - os: windows-latest + # toolchain: {compiler: intel-classic, version: '2021.9', cflags: '/Qdiag-disable:10441', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', generator: 'Ninja'} + # - os: windows-latest + # toolchain: {compiler: intel-classic, version: '2021.9', cflags: '/Qdiag-disable:10441', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', cc: cl, generator: 'Ninja'} + # - os: windows-latest + # toolchain: {compiler: intel-classic, version: '2021.9', cflags: '', fflags: '', cc: cl, generator: 'Visual Studio 17 2022'} steps: @@ -140,11 +123,11 @@ jobs: echo "FC=${FC}" echo "CC=${CC}" cmake --version - cmake -G "${{ matrix.toolchain.generator }}" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=. -LAH -DCMAKE_C_FLAGS="${{ matrix.toolchain.cflags }}" -DCMAKE_Fortran_FLAGS="${{ matrix.toolchain.fflags }}" . || ls -l . - ls -l ./CMakeFiles - cat ./CMakeFiles/CMakeConfigureLog.yaml - cmake --build . --target install - cmake --build . --target tests + cmake -G "${{ matrix.toolchain.generator }}" -A x64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=. -LAH -DCMAKE_C_FLAGS="${{ matrix.toolchain.cflags }}" -DCMAKE_Fortran_FLAGS="${{ matrix.toolchain.fflags }}" -B build || ls -l build + ls -l build/CMakeFiles + cat build/CMakeFiles/CMakeConfigureLog.yaml + cmake --build build --target install + cmake --build build --target tests ctest --output-on-failure -V -E stress env: FC: ${{ steps.setup-fortran.outputs.fc }}