Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Inserted location of unit tests to linux tests #303

Merged
merged 9 commits into from
Sep 4, 2024
27 changes: 12 additions & 15 deletions .github/workflows/tests-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/tests-macos-intel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
12 changes: 8 additions & 4 deletions .github/workflows/tests-macos-silicon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 0 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import imp
import os
import subprocess as sub
import sys
from distutils.command.clean import clean
from glob import glob
Expand Down
2 changes: 1 addition & 1 deletion tests/Atmesc/HydELimConstXUVLopez12/planet.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading