From eb0d47b6481b3144845280253b302af96d750990 Mon Sep 17 00:00:00 2001 From: Jonah Miller Date: Thu, 29 Aug 2024 10:38:01 -0600 Subject: [PATCH 1/4] add CI tests and add catch v3 to spackage --- .github/workflows/tests-minimal.yml | 29 ++++++++++++++++++++ spack-repo/packages/ports-of-call/package.py | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 .github/workflows/tests-minimal.yml diff --git a/.github/workflows/tests-minimal.yml b/.github/workflows/tests-minimal.yml new file mode 100644 index 00000000..bfaf0082 --- /dev/null +++ b/.github/workflows/tests-minimal.yml @@ -0,0 +1,29 @@ +name: Tests minimal + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + +jobs: + tests: + name: Minimal test suite + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + with: + submodules: recursive + - name: Set system to non-interactive mode + run: export DEBIAN_FRONTEND=noninteractive + - name: install dependencies + run: | + sudo apt-get install -y --force-yes -qq build-essential + - name: build and install + run: | + mkdir -p buld && cd build + cmake -DPORTS_OF_CALL_BUILD_TESTING=ON .. + make -j + make test diff --git a/spack-repo/packages/ports-of-call/package.py b/spack-repo/packages/ports-of-call/package.py index c2bba612..1a60d68d 100644 --- a/spack-repo/packages/ports-of-call/package.py +++ b/spack-repo/packages/ports-of-call/package.py @@ -41,8 +41,10 @@ class PortsOfCall(CMakePackage): default="None", when="@:1.2.0", ) + variant("test", default=False, description="Build tests") depends_on("cmake@3.12:") + depends_on("catch2@3.0.1:", when"+test") def cmake_args(self): args = [] From 2826e27b03ba880caafeca257bead8c9d7afbdc3 Mon Sep 17 00:00:00 2001 From: Jonah Miller Date: Thu, 29 Aug 2024 10:42:17 -0600 Subject: [PATCH 2/4] add test to cmake args --- spack-repo/packages/ports-of-call/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spack-repo/packages/ports-of-call/package.py b/spack-repo/packages/ports-of-call/package.py index 1a60d68d..d4c89053 100644 --- a/spack-repo/packages/ports-of-call/package.py +++ b/spack-repo/packages/ports-of-call/package.py @@ -47,7 +47,9 @@ class PortsOfCall(CMakePackage): depends_on("catch2@3.0.1:", when"+test") def cmake_args(self): - args = [] + args = [ + self.define_from_variant("PORTS_OF_CALL_BUILD_TESTING", "test"), + ] if self.spec.satisfies("@:1.2.0"): args.append(self.define_from_variant("PORTABILITY_STRATEGY", "portability_strategy")) return args From 13710dd6008c43dd94c0ecfa1b65f3199bee3d58 Mon Sep 17 00:00:00 2001 From: Jonah Miller Date: Thu, 29 Aug 2024 10:44:46 -0600 Subject: [PATCH 3/4] try again --- .github/workflows/tests-minimal.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests-minimal.yml b/.github/workflows/tests-minimal.yml index bfaf0082..e33c92e1 100644 --- a/.github/workflows/tests-minimal.yml +++ b/.github/workflows/tests-minimal.yml @@ -23,7 +23,8 @@ jobs: sudo apt-get install -y --force-yes -qq build-essential - name: build and install run: | - mkdir -p buld && cd build + mkdir -p buld + cd build cmake -DPORTS_OF_CALL_BUILD_TESTING=ON .. make -j make test From 6ac0b794d196de0b7de79d86dc061cc41555b1e7 Mon Sep 17 00:00:00 2001 From: Jonah Miller Date: Thu, 29 Aug 2024 10:45:36 -0600 Subject: [PATCH 4/4] buld->build --- .github/workflows/tests-minimal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests-minimal.yml b/.github/workflows/tests-minimal.yml index e33c92e1..a4ae3a5f 100644 --- a/.github/workflows/tests-minimal.yml +++ b/.github/workflows/tests-minimal.yml @@ -23,7 +23,7 @@ jobs: sudo apt-get install -y --force-yes -qq build-essential - name: build and install run: | - mkdir -p buld + mkdir -p build cd build cmake -DPORTS_OF_CALL_BUILD_TESTING=ON .. make -j