Skip to content

Commit 4f1cc28

Browse files
Merge pull request #139 from valeriupredoi/update_gha_versions
update github actions GHA versions and add new variable test for new `hostname` on Github Actions machines
2 parents 3444789 + f706fb8 commit 4f1cc28

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

.github/workflows/run-tests-push.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
fail-fast: false
1313
name: Linux Python ${{ matrix.python-version }}
1414
steps:
15-
- uses: actions/checkout@v2
16-
- uses: conda-incubator/setup-miniconda@v2
15+
- uses: actions/checkout@v4
16+
- uses: conda-incubator/setup-miniconda@v3
1717
with:
1818
activate-environment: bgcval2
1919
environment-file: environment.yml
@@ -38,6 +38,7 @@ jobs:
3838
bgcval2_make_report --help
3939
download_from_mass --help
4040
- shell: bash -l {0}
41-
run: pytest
41+
run: |
42+
pytest
4243
- shell: bash -l {0}
4344
run: sphinx-build -Ea doc doc/build

.github/workflows/run-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ jobs:
1717
fail-fast: false
1818
name: Linux Python ${{ matrix.python-version }}
1919
steps:
20-
- uses: actions/checkout@v2
21-
- uses: conda-incubator/setup-miniconda@v2
20+
- uses: actions/checkout@v4
21+
- uses: conda-incubator/setup-miniconda@v3
2222
with:
2323
activate-environment: bgcval2
2424
environment-file: environment.yml

bgcval2/_runtime_config.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ def _establish_hostname():
6161
elif gethostname().find('pmpc') > -1:
6262
hostname = "pml"
6363
elif gethostname().find('-az') > -1:
64-
hostname = "local-test-only" # for testing on GA machine
64+
hostname = "local-test-only" # for testing on GA machine (old type)
65+
elif os.environ.get("INPUT_RUN_POST", None):
66+
hostname = "local-test-only" # for testing on GA machine (new type)
6567
# FIXME local testing only
6668
elif gethostname().find('valeriu-PORTEGE-Z30-C') > -1:
6769
hostname = "local-test-only" # for testing on V's laptop

0 commit comments

Comments
 (0)