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 ++++++++-------- ci/run_tests.bat | 19 +++++++++++++++++++ ci/run_tests.sh | 10 ++++++++++ 3 files changed, 37 insertions(+), 8 deletions(-) create mode 100755 ci/run_tests.bat create mode 100755 ci/run_tests.sh 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 diff --git a/ci/run_tests.bat b/ci/run_tests.bat new file mode 100755 index 0000000..258eae8 --- /dev/null +++ b/ci/run_tests.bat @@ -0,0 +1,19 @@ +@echo on + +cd fpm +if errorlevel 1 exit 1 + +fpm build +if errorlevel 1 exit 1 + +fpm run +if errorlevel 1 exit 1 + +fpm run --args build +if errorlevel 1 exit 1 + +cd ..\test\example_packages\hello_world +if errorlevel 1 exit 1 + +..\..\..\fpm\fpm build +if errorlevel 1 exit 1 diff --git a/ci/run_tests.sh b/ci/run_tests.sh new file mode 100755 index 0000000..9767c9a --- /dev/null +++ b/ci/run_tests.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +set -ex + +cd fpm +fpm build +fpm run +fpm run --args build +cd ../test/example_packages/hello_world +../../../fpm/fpm build -- cgit v1.2.3