From 01c4e726650cab4237c23fde66cab2d9b5f21586 Mon Sep 17 00:00:00 2001 From: jalvesz <102541118+jalvesz@users.noreply.github.com> Date: Sun, 14 Jan 2024 21:11:45 +0100 Subject: [PATCH 1/5] Update ci.yml test ci with fpm --- .github/workflows/ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6f0fb1d..0df8e6e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,6 +32,10 @@ jobs: compiler: ${{ matrix.toolchain.compiler }} version: ${{ matrix.toolchain.version }} + - name: Setup Fortran Package Manager + uses: fortran-lang/setup-fpm@v5 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + - run: | - ${{ env.FC }} ... # environment vars FC, CC, and CXX are set - ${{ steps.setup-fortran.outputs.fc }} ... # outputs work too \ No newline at end of file + fpm test --compiler gfortran --flag "-03" From 7f4c1efc7699f9bba241688935daf0ab7611407b Mon Sep 17 00:00:00 2001 From: jalvesz <102541118+jalvesz@users.noreply.github.com> Date: Sun, 14 Jan 2024 21:16:23 +0100 Subject: [PATCH 2/5] Update ci.yml --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0df8e6e..d2a32c7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,4 +38,5 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} - run: | - fpm test --compiler gfortran --flag "-03" + ${{ env.FC }} ... # environment vars FC, CC, and CXX are set + ${{ steps.setup-fortran.outputs.fc }} ... # outputs work too From b62c3e7fb62a578f0c035e2575f2eec5fc720d47 Mon Sep 17 00:00:00 2001 From: jalvesz <102541118+jalvesz@users.noreply.github.com> Date: Sun, 14 Jan 2024 21:40:35 +0100 Subject: [PATCH 3/5] Update ci.yml --- .github/workflows/ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d2a32c7..c7991b4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,5 +38,7 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} - run: | - ${{ env.FC }} ... # environment vars FC, CC, and CXX are set - ${{ steps.setup-fortran.outputs.fc }} ... # outputs work too + export FPM_FC=${{ env.FC }} + fpm test --flag "-O3" + # ${{ env.FC }} ... # environment vars FC, CC, and CXX are set + # ${{ steps.setup-fortran.outputs.fc }} ... # outputs work too From 17a0f5856ffb6475fdcfc8ac99e24879e1434ed6 Mon Sep 17 00:00:00 2001 From: jalvesz <102541118+jalvesz@users.noreply.github.com> Date: Sun, 14 Jan 2024 21:43:46 +0100 Subject: [PATCH 4/5] Update ci.yml --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c7991b4..060a797 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,6 +39,7 @@ jobs: - run: | export FPM_FC=${{ env.FC }} + cd ../.. fpm test --flag "-O3" # ${{ env.FC }} ... # environment vars FC, CC, and CXX are set # ${{ steps.setup-fortran.outputs.fc }} ... # outputs work too From 29babe2d20cffb8a39a05c85855931622ce38f9e Mon Sep 17 00:00:00 2001 From: jalvesz <102541118+jalvesz@users.noreply.github.com> Date: Sun, 14 Jan 2024 21:49:07 +0100 Subject: [PATCH 5/5] Update ci.yml --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 060a797..4170b9f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,6 +26,9 @@ jobs: toolchain: {compiler: nvidia-hpc, version: '23.11'} steps: + - name: Checkout code + uses: actions/checkout@v1 + - uses: fortran-lang/setup-fortran@v1 id: setup-fortran with: @@ -39,7 +42,6 @@ jobs: - run: | export FPM_FC=${{ env.FC }} - cd ../.. fpm test --flag "-O3" # ${{ env.FC }} ... # environment vars FC, CC, and CXX are set # ${{ steps.setup-fortran.outputs.fc }} ... # outputs work too