Updating GitHub actions [6]

amnh · Aug 28, 2024 · 7fdfcd9 · 7fdfcd9
1 parent 8e3f86b
commit 7fdfcd9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/.github/workflows/integration-test-suite.yaml b/.github/workflows/integration-test-suite.yaml
@@ -12,10 +12,11 @@ defaults:
 
 env:
   PROJECTFILE: --project-file=config/cabal.project.integration
-  TESTDETAILS: --test-show-details=streaming
-  TESTOPTIONS: --test-options="--timeout=30s"
+#  TESTDETAILS: --test-show-details=streaming
+  TESTOPTIONS: --subset-rapid
+#  TESTOPTIONS: --test-options="--timeout=30s"
   THISMAINEXE: PhyGraph:phyg
-  THISTESTEXE: PHAGE-integration-tests:integration-tests
+  THISTESTEXE: :pkg:PhyG-integration-tests:exe:PhyG-Integration-Tests
 
 on:
 
@@ -74,7 +75,7 @@ jobs:
             cabal clean     ${PROJECTFILE}
             cabal freeze    ${PROJECTFILE}
             cabal configure ${PROJECTFILE} --enable-tests --enable-benchmarks --disable-documentation
-            cabal build all ${PROJECTFILE} --dry-run
+            cabal install ${THISMAINEXE} ${THISTESTEXE} ${PROJECTFILE} --dry-run
             # The last step generates dist-newstyle/cache/plan.json for the cache key.
 
       - name: 'Cabal - Cache [1]'
@@ -90,7 +91,7 @@ jobs:
       - name: 'Cabal - Install dependencies'
         # If we had an exact cache hit, the dependencies will be up to date.
         if: steps.cache.outputs.cache-hit != 'true'
-        run: cabal build all --only-dependencies
+        run: cabal build ${THISMAINEXE} ${THISTESTEXE} ${PROJECTFILE} --only-dependencies
 
       # Cache dependencies already here, so that we do not have to rebuild them should the subsequent steps fail.
       - name: 'Cabal - Cache [2]'
@@ -103,11 +104,12 @@ jobs:
 
       - name: 'Cabal - Build'
         run: |
-          cabal build ${THISMAINEXE} ${THISTESTEXE} ${PROJECTFILE} --only-dependencies
+          cabal build   ${THISMAINEXE} ${THISTESTEXE} ${PROJECTFILE}
+          cabal install ${THISMAINEXE}                ${PROJECTFILE}
 
       - name: 'Cabal - Integration Tests'
         run: |
-          cabal test  ${THISTESTEXE} ${PROJECTFILE} ${TESTDETAILS} ${TESTOPTIONS}
+          cabal run ${THISTESTEXE} ${PROJECTFILE} -- ${TESTOPTIONS} # ${TESTDETAILS}
 
 #      - name: Send mail on failure
 #        if: ${{ failure() }}

diff --git a/config/cabal.project.development b/config/cabal.project.development
@@ -149,6 +149,11 @@ Source-Repository-Package
   Subdir:   pkg/PHANE-PhyloLib
   Tag: 6f300d99c3be9e5201f31ac4480bbacb3f547f8b
 
+Source-Repository-Package
+  Type:     git
+  Location: https://github.com/amnh/PhyG-integration-tests
+  Tag: 327142c6ab18533be294f83a1687cb13ea6d42c1
+
 
 ---------------------------------------------------------------------------------
 -- Output paths
@@ -157,7 +162,6 @@ Source-Repository-Package
 -- and log files of the build/benchmarks/tests should go in `log`.
 ---------------------------------------------------------------------------------
 
-Builddir:         ./doc
 Symlink-bindir:   ./bin
 Installdir:       ./bin
 Logs-Dir:         ./log