Merge pull request #303 from VirtualPlanetaryLaboratory/download-arti…

…fact Inserted location of unit tests to linux tests
VirtualPlanetaryLaboratory · Sep 4, 2024 · 755f9f3 · 755f9f3
2 parents 39ccbac + 0f9f5fb
commit 755f9f3
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 27 deletions.
diff --git a/.github/workflows/tests-linux.yml b/.github/workflows/tests-linux.yml
@@ -46,32 +46,29 @@ jobs:
         shell: bash -l {0}
         run: |
           make opt
-          pytest --tb=short
+          pytest --tb=short --junitxml=junit/test-results.xml
 
-      - name: Check test ouptut created
+      - name: Check test output created
         id: check_test_file
+        if: ${{ matrix.os == 'ubuntu-22.04' && matrix.python-version == '3.9' }}
         uses: andstor/file-existence-action@v3
         with:
-          files: "/home/runner/work/vplanet/vplanet/junit/test-results.xml"
+          files: "${{ github.workspace }}/junit/test-results.xml"
           fail: true
 
-      - name: Generate coverage
-        id: coverage
-        if: steps.test.outcome == 'success' && steps.check_test_file.outcome == 'success'
-        run: make coverage
-
-      - name: Get unique id
-        uses: Tiryoh/gha-jobid-action@v1
-        id: jobs
-
       - name: Publish unit test results
+        if: ${{ matrix.os == 'ubuntu-22.04' && matrix.python-version == '3.9' }}
         uses: EnricoMi/publish-unit-test-result-action@v2
-        if: always()
         with:
           files: junit/test-*.xml
 
-      - name: CodeCov
-        if:  ${{ matrix.os }} == ubuntu-22.04 &&  ${{ matrix.python-version }} == '3.9'
+      - name: Generate coverage
+        id: coverage
+        if: ${{ matrix.os == 'ubuntu-22.04' && matrix.python-version == '3.9' && steps.test.outcome == 'success' && steps.check_test_file.outcome == 'success' }}
+        run: make coverage
+
+      - name: Upload to CodeCov
+        if: ${{ matrix.os == 'ubuntu-22.04' && matrix.python-version == '3.9' }}
         uses: codecov/codecov-action@v4
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

diff --git a/.github/workflows/tests-macos-intel.yml b/.github/workflows/tests-macos-intel.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-11, macos-12, macos-13]
+        os: [macos-12, macos-13]
         python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11']
       fail-fast: false
     steps:
@@ -35,8 +35,11 @@ jobs:
         if: steps.setup_python.outcome == 'success'
         run: |
           make opt
-          pytest --tb=short
+          pytest --tb=short --junitxml=junit/test-results.xml
 
-      - name: Get unique id
-        uses: Tiryoh/gha-jobid-action@v1
-        id: jobs
+      - name: Check test ouptut created
+        id: check_test_file
+        uses: andstor/file-existence-action@v3
+        with:
+          files: "${{ github.workspace }}/junit/test-results.xml"
+          fail: true
diff --git a/.github/workflows/tests-macos-silicon.yml b/.github/workflows/tests-macos-silicon.yml
@@ -35,8 +35,12 @@ jobs:
         if: steps.setup_python.outcome == 'success'
         run: |
           make opt
-          pytest --tb=short
+          pytest --tb=short --junitxml=junit/test-results.xml
+
+      - name: Check test ouptut created
+        id: check_test_file
+        uses: andstor/file-existence-action@v3
+        with:
+          files: "${{ github.workspace }}/junit/test-results.xml"
+          fail: true
 
-      - name: Get unique id
-        uses: Tiryoh/gha-jobid-action@v1
-        id: jobs
diff --git a/setup.py b/setup.py
@@ -1,6 +1,4 @@
-import imp
 import os
-import subprocess as sub
 import sys
 from distutils.command.clean import clean
 from glob import glob

diff --git a/tests/Atmesc/HydELimConstXUVLopez12/planet.in b/tests/Atmesc/HydELimConstXUVLopez12/planet.in
@@ -8,7 +8,7 @@ dRadGyra	            0.4	        # Radius of gyration; ang. mom. coeff.
 dAge                    1.0e6        # Age [yr]
 
 # ATMESC Parameters
-dFXUV                      -100             # Incident XUV flux (constant)
+dFXUV                   -100    # Incident XUV flux (constant)
 dXFrac                  1.0     # X-Ray/XUV absorption radius in planet radii
 dAtmXAbsEffH            0.1     # H X-ray/XUV absorption efficiency (epsilon)
 dSurfWaterMass   	    0.0     # Initial water mass, negative -> Earth oceans