From 6de7f236b3784c7e2cf3b8cf3efc06ee5e84f2d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Tue, 21 Jul 2020 16:00:00 -0600 Subject: Test hello_world at the CI --- .github/workflows/CI.yml | 3 +++ 1 file changed, 3 insertions(+) (limited to '.github/workflows/CI.yml') diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 0de8b3e..574c565 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -88,3 +88,6 @@ jobs: fpm build fpm run fpm run --args build + cd ../test/example_packages/hello_world + ../../../fpm/fpm build + ./hello_world -- cgit v1.2.3 From 3bb8b39eccafc5acb0ee08a201c09aa0e828ce28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Tue, 21 Jul 2020 16:19:01 -0600 Subject: Extract the CI tests into a Bash and Batch files --- .github/workflows/CI.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to '.github/workflows/CI.yml') diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 574c565..784a0d6 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -82,12 +82,12 @@ jobs: cd bootstrap stack test - - name: Build and run Fortran fpm + - name: Build and run Fortran fpm (Linux / macOS) + if: contains(matrix.os, 'ubuntu') || contains(matrix.os, 'macos') run: | - cd fpm - fpm build - fpm run - fpm run --args build - cd ../test/example_packages/hello_world - ../../../fpm/fpm build - ./hello_world + ci/run_tests.sh + + - name: Build and run Fortran fpm (Windows) + if: contains(matrix.os, 'ubuntu') || contains(matrix.os, 'macos') + run: | + call ci/run_tests.bat -- cgit v1.2.3 From 62401a9a9d92b3f04c7faa5fbb828f978dfc82ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Tue, 21 Jul 2020 16:21:53 -0600 Subject: Use \ on Windows --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows/CI.yml') diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 784a0d6..a0d99d3 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -90,4 +90,4 @@ jobs: - name: Build and run Fortran fpm (Windows) if: contains(matrix.os, 'ubuntu') || contains(matrix.os, 'macos') run: | - call ci/run_tests.bat + call ci\run_tests.bat -- cgit v1.2.3 From 706f8a606ae42c162faff4def29cdd187f3b020a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Tue, 21 Jul 2020 16:22:47 -0600 Subject: CI: Use the correct condition on Windows --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows/CI.yml') diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index a0d99d3..172806b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -88,6 +88,6 @@ jobs: ci/run_tests.sh - name: Build and run Fortran fpm (Windows) - if: contains(matrix.os, 'ubuntu') || contains(matrix.os, 'macos') + if: contains(matrix.os, 'windows') run: | call ci\run_tests.bat -- cgit v1.2.3 From 3bd6db28fbd1392c2c883b48e7beb783114d0d06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Tue, 21 Jul 2020 16:38:22 -0600 Subject: CI: Execute the bat file without "call" --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows/CI.yml') diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 172806b..4666022 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -90,4 +90,4 @@ jobs: - name: Build and run Fortran fpm (Windows) if: contains(matrix.os, 'windows') run: | - call ci\run_tests.bat + ci\run_tests.bat -- cgit v1.2.3