Skip to content

Commit 03a292c

Browse files
Merge pull request #244 from NCAS-CMS/improve_gha
improve github actions gha tests on main branch
2 parents a136acc + 3139e68 commit 03a292c

6 files changed

+49
-15
lines changed

.github/workflows/build-and-deploy-on-pypi.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
name: Build and publish PyActiveStorage on PyPi
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
1717
with:
1818
fetch-depth: 0
1919
- name: Set up Python 3.13

.github/workflows/create-condalock-file.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
name: Create and verify conda lock file for latest Python
2121
runs-on: 'ubuntu-latest'
2222
steps:
23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2424
with:
2525
fetch-depth: 0
2626
- uses: conda-incubator/setup-miniconda@v3

.github/workflows/install-from-condalock-file.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
fail-fast: false
2626
name: Linux Python ${{ matrix.python-version }}
2727
steps:
28-
- uses: actions/checkout@v3
28+
- uses: actions/checkout@v4
2929
with:
3030
fetch-depth: 0
3131
- uses: conda-incubator/setup-miniconda@v3

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

+10-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
fail-fast: false
1818
name: Linux Python ${{ matrix.python-version }}
1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121
with:
2222
fetch-depth: 0
2323
- uses: conda-incubator/setup-miniconda@v3
@@ -27,9 +27,17 @@ jobs:
2727
python-version: ${{ matrix.python-version }}
2828
miniforge-version: "latest"
2929
use-mamba: true
30+
mamba-version: "2.0.5" # https://github.com/conda-incubator/setup-miniconda/issues/392
3031
- run: conda --version
3132
- run: python -V
33+
- name: Install development version of NCAS-CMS/Pyfive:wacasoft
34+
run: |
35+
cd ..
36+
git clone https://github.com/NCAS-CMS/pyfive.git
37+
cd pyfive
38+
git checkout wacasoft
39+
pip install -e .
3240
- run: pip install -e .
3341
- run: conda list
3442
- run: pytest -n 2 --junitxml=report-1.xml
35-
- uses: codecov/codecov-action@v3
43+
- uses: codecov/codecov-action@v5

.github/workflows/run-tests.yml

+19-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- main
7+
- pyfive
78
schedule:
89
- cron: '0 0 * * *' # nightly
910

@@ -21,7 +22,7 @@ jobs:
2122
fail-fast: false
2223
name: Linux Python ${{ matrix.python-version }}
2324
steps:
24-
- uses: actions/checkout@v3
25+
- uses: actions/checkout@v4
2526
with:
2627
fetch-depth: 0
2728
- uses: conda-incubator/setup-miniconda@v3
@@ -31,8 +32,16 @@ jobs:
3132
python-version: ${{ matrix.python-version }}
3233
miniforge-version: "latest"
3334
use-mamba: true
35+
mamba-version: "2.0.5" # https://github.com/conda-incubator/setup-miniconda/issues/392
3436
- run: conda --version
3537
- run: python -V
38+
- name: Install development version of NCAS-CMS/Pyfive:wacasoft
39+
run: |
40+
cd ..
41+
git clone https://github.com/NCAS-CMS/pyfive.git
42+
cd pyfive
43+
git checkout wacasoft
44+
pip install -e .
3645
- run: conda list
3746
- run: pip install -e .
3847
- run: conda list
@@ -46,7 +55,7 @@ jobs:
4655
fail-fast: false
4756
name: OSX Python ${{ matrix.python-version }}
4857
steps:
49-
- uses: actions/checkout@v3
58+
- uses: actions/checkout@v4
5059
with:
5160
fetch-depth: 0
5261
- uses: conda-incubator/setup-miniconda@v3
@@ -56,8 +65,16 @@ jobs:
5665
python-version: ${{ matrix.python-version }}
5766
miniforge-version: "latest"
5867
use-mamba: true
68+
mamba-version: "2.0.5" # https://github.com/conda-incubator/setup-miniconda/issues/392
5969
- run: conda --version
6070
- run: python -V
71+
- name: Install development version of NCAS-CMS/Pyfive:wacasoft
72+
run: |
73+
cd ..
74+
git clone https://github.com/NCAS-CMS/pyfive.git
75+
cd pyfive
76+
git checkout wacasoft
77+
pip install -e .
6178
- run: conda list
6279
- run: mamba install -c conda-forge git
6380
- run: pip install -e .

.github/workflows/test_s3_minio.yml

+17-8
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,15 @@ jobs:
2424
fail-fast: false
2525
name: Linux Python ${{ matrix.python-version }}
2626
steps:
27-
- uses: actions/checkout@v3
27+
- uses: actions/checkout@v4
2828
with:
2929
fetch-depth: 0
3030
- uses: conda-incubator/setup-miniconda@v3
3131
with:
3232
python-version: ${{ matrix.python-version }}
3333
miniforge-version: "latest"
3434
use-mamba: true
35+
mamba-version: "2.0.5" # https://github.com/conda-incubator/setup-miniconda/issues/392
3536
- name: Get conda and Python versions
3637
run: |
3738
conda --version
@@ -55,6 +56,14 @@ jobs:
5556
python-version: ${{ matrix.python-version }}
5657
miniforge-version: "latest"
5758
use-mamba: true
59+
mamba-version: "2.0.5" # https://github.com/conda-incubator/setup-miniconda/issues/392
60+
- name: Install development version of NCAS-CMS/Pyfive:wacasoft
61+
run: |
62+
cd ..
63+
git clone https://github.com/NCAS-CMS/pyfive.git
64+
cd pyfive
65+
git checkout wacasoft
66+
pip install -e .
5867
- name: Install PyActiveStorage
5968
run: |
6069
conda --version
@@ -79,10 +88,10 @@ jobs:
7988
- name: Stop minio object storage
8089
run: tests/s3_exploratory/minio_scripts/minio-stop
8190
if: always()
82-
- name: Upload HTML report artifact
83-
uses: actions/upload-artifact@v4
84-
with:
85-
name: html-report
86-
path: test-reports/
87-
overwrite: true
88-
if: always()
91+
#- name: Upload HTML report artifact
92+
# uses: actions/upload-artifact@v4
93+
# with:
94+
# name: html-report
95+
# path: test-reports/
96+
# overwrite: true
97+
# if: always()

0 commit comments

Comments
 (0)