From 5c5e37cc03175a743f84a8e7bdc030cc9338e2c0 Mon Sep 17 00:00:00 2001 From: wpbonelli Date: Tue, 28 Jan 2025 08:05:13 -0500 Subject: [PATCH 1/3] try flag --- .github/workflows/ci.yml | 14 +++++++------- autotest/test_gridgen.py | 2 ++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bc8a00a..66869bb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,16 +27,16 @@ jobs: matrix: include: # test latest gcc and python - - {os: ubuntu-latest, FC: gcc, FC_V: 13, shell: bash} - - {os: macos-latest, FC: gcc, FC_V: 13, shell: bash} - - {os: windows-latest, FC: gcc, FC_V: 13, shell: pwsh} + # - {os: ubuntu-latest, FC: gcc, FC_V: 13, shell: bash} + # - {os: macos-latest, FC: gcc, FC_V: 13, shell: bash} + # - {os: windows-latest, FC: gcc, FC_V: 13, shell: pwsh} # test latest python and intel-classic - {os: ubuntu-latest, FC: intel-classic, FC_V: 2021.7, shell: bash} - - {os: macos-13, FC: intel-classic, FC_V: 2021.7, shell: bash} - - {os: windows-2019, FC: intel-classic, FC_V: 2021.7, shell: pwsh} + # - {os: macos-13, FC: intel-classic, FC_V: 2021.7, shell: bash} + # - {os: windows-2019, FC: intel-classic, FC_V: 2021.7, shell: pwsh} # test latest python and previous gcc - - {os: ubuntu-latest, FC: gcc, FC_V: 12, shell: bash} - - {os: ubuntu-latest, FC: gcc, FC_V: 11, shell: bash} + # - {os: ubuntu-latest, FC: gcc, FC_V: 12, shell: bash} + # - {os: ubuntu-latest, FC: gcc, FC_V: 11, shell: bash} defaults: run: shell: ${{ matrix.shell }} diff --git a/autotest/test_gridgen.py b/autotest/test_gridgen.py index 4b80016..f284697 100644 --- a/autotest/test_gridgen.py +++ b/autotest/test_gridgen.py @@ -36,6 +36,8 @@ def pm(module_tmpdir, target) -> pymake.Pymake: pm.fc = None pm.inplace = True pm.makeclean = True + if system() == "Linux": + pm.cflags = "-D_Float128=__float12" yield pm pm.finalize() From 58227fba496540bbff14d98d02fdfd5e808175d8 Mon Sep 17 00:00:00 2001 From: w-bonelli Date: Tue, 28 Jan 2025 09:01:28 -0500 Subject: [PATCH 2/3] try ubuntu 22.04 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 66869bb..70eeb3d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: # - {os: macos-latest, FC: gcc, FC_V: 13, shell: bash} # - {os: windows-latest, FC: gcc, FC_V: 13, shell: pwsh} # test latest python and intel-classic - - {os: ubuntu-latest, FC: intel-classic, FC_V: 2021.7, shell: bash} + - {os: ubuntu-22.04, FC: intel-classic, FC_V: 2021.7, shell: bash} # - {os: macos-13, FC: intel-classic, FC_V: 2021.7, shell: bash} # - {os: windows-2019, FC: intel-classic, FC_V: 2021.7, shell: pwsh} # test latest python and previous gcc From 2319ef39da2e66952f7371e51a66d9bb5450aa23 Mon Sep 17 00:00:00 2001 From: wpbonelli Date: Tue, 28 Jan 2025 09:49:48 -0500 Subject: [PATCH 3/3] cleanup --- .github/workflows/ci.yml | 14 +++++++------- autotest/test_gridgen.py | 2 -- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 70eeb3d..355ed20 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,16 +27,16 @@ jobs: matrix: include: # test latest gcc and python - # - {os: ubuntu-latest, FC: gcc, FC_V: 13, shell: bash} - # - {os: macos-latest, FC: gcc, FC_V: 13, shell: bash} - # - {os: windows-latest, FC: gcc, FC_V: 13, shell: pwsh} + - {os: ubuntu-latest, FC: gcc, FC_V: 13, shell: bash} + - {os: macos-latest, FC: gcc, FC_V: 13, shell: bash} + - {os: windows-latest, FC: gcc, FC_V: 13, shell: pwsh} # test latest python and intel-classic - {os: ubuntu-22.04, FC: intel-classic, FC_V: 2021.7, shell: bash} - # - {os: macos-13, FC: intel-classic, FC_V: 2021.7, shell: bash} - # - {os: windows-2019, FC: intel-classic, FC_V: 2021.7, shell: pwsh} + - {os: macos-13, FC: intel-classic, FC_V: 2021.7, shell: bash} + - {os: windows-2019, FC: intel-classic, FC_V: 2021.7, shell: pwsh} # test latest python and previous gcc - # - {os: ubuntu-latest, FC: gcc, FC_V: 12, shell: bash} - # - {os: ubuntu-latest, FC: gcc, FC_V: 11, shell: bash} + - {os: ubuntu-latest, FC: gcc, FC_V: 12, shell: bash} + - {os: ubuntu-latest, FC: gcc, FC_V: 11, shell: bash} defaults: run: shell: ${{ matrix.shell }} diff --git a/autotest/test_gridgen.py b/autotest/test_gridgen.py index f284697..4b80016 100644 --- a/autotest/test_gridgen.py +++ b/autotest/test_gridgen.py @@ -36,8 +36,6 @@ def pm(module_tmpdir, target) -> pymake.Pymake: pm.fc = None pm.inplace = True pm.makeclean = True - if system() == "Linux": - pm.cflags = "-D_Float128=__float12" yield pm pm.finalize()