From ead3e60a8e9b54d3f4bc3e70f199e530eb376844 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Fri, 28 Feb 2025 15:42:03 +0000 Subject: [PATCH 1/4] force mamba 2 --- .github/workflows/run-test-push.yml | 1 + .github/workflows/run-tests.yml | 2 ++ .github/workflows/test_s3_minio.yml | 4 +++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-test-push.yml b/.github/workflows/run-test-push.yml index 33471813..fb2047d3 100644 --- a/.github/workflows/run-test-push.yml +++ b/.github/workflows/run-test-push.yml @@ -27,6 +27,7 @@ jobs: python-version: ${{ matrix.python-version }} miniforge-version: "latest" use-mamba: true + mamba-version: "2.0.5" # https://github.com/conda-incubator/setup-miniconda/issues/392 - run: conda --version - run: python -V - name: Install development version of NCAS-CMS/Pyfive:wacasoft diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 8a278038..cc24aba7 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -32,6 +32,7 @@ jobs: python-version: ${{ matrix.python-version }} miniforge-version: "latest" use-mamba: true + mamba-version: "2.0.5" # https://github.com/conda-incubator/setup-miniconda/issues/392 - run: conda --version - run: python -V - name: Install development version of NCAS-CMS/Pyfive:wacasoft @@ -64,6 +65,7 @@ jobs: python-version: ${{ matrix.python-version }} miniforge-version: "latest" use-mamba: true + mamba-version: "2.0.5" # https://github.com/conda-incubator/setup-miniconda/issues/392 - run: conda --version - run: python -V - name: Install development version of NCAS-CMS/Pyfive:wacasoft diff --git a/.github/workflows/test_s3_minio.yml b/.github/workflows/test_s3_minio.yml index 1232d768..ca586297 100644 --- a/.github/workflows/test_s3_minio.yml +++ b/.github/workflows/test_s3_minio.yml @@ -7,7 +7,7 @@ on: branches: - main # keep this at all times # - pyfive # reinstate - - new_api_pyfive + - tlc1 pull_request: schedule: - cron: '0 0 * * *' # nightly @@ -34,6 +34,7 @@ jobs: python-version: ${{ matrix.python-version }} miniforge-version: "latest" use-mamba: true + mamba-version: "2.0.5" # https://github.com/conda-incubator/setup-miniconda/issues/392 - name: Get conda and Python versions run: | conda --version @@ -57,6 +58,7 @@ jobs: python-version: ${{ matrix.python-version }} miniforge-version: "latest" use-mamba: true + mamba-version: "2.0.5" # https://github.com/conda-incubator/setup-miniconda/issues/392 - name: Install development version of NCAS-CMS/Pyfive:wacasoft run: | cd .. From c588b0da432f56fc092656fb79bb80665565db63 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Wed, 5 Mar 2025 15:32:23 +0000 Subject: [PATCH 2/4] up codecov action to v5 --- .github/workflows/run-test-push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-test-push.yml b/.github/workflows/run-test-push.yml index fb2047d3..03d61b6f 100644 --- a/.github/workflows/run-test-push.yml +++ b/.github/workflows/run-test-push.yml @@ -40,4 +40,4 @@ jobs: - run: pip install -e . - run: conda list - run: pytest -n 2 --junitxml=report-1.xml - - uses: codecov/codecov-action@v3 + - uses: codecov/codecov-action@v5 From 93f6362568ece5d3467a3ebaf1985b1dec05a7d7 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Wed, 5 Mar 2025 15:39:25 +0000 Subject: [PATCH 3/4] up checkout version and disable artifacts --- .github/workflows/build-and-deploy-on-pypi.yml | 2 +- .github/workflows/create-condalock-file.yml | 2 +- .../workflows/install-from-condalock-file.yml | 2 +- .github/workflows/run-test-push.yml | 2 +- .github/workflows/run-tests.yml | 4 ++-- .github/workflows/test_s3_minio.yml | 16 ++++++++-------- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build-and-deploy-on-pypi.yml b/.github/workflows/build-and-deploy-on-pypi.yml index cf08f402..fd7ac1d1 100644 --- a/.github/workflows/build-and-deploy-on-pypi.yml +++ b/.github/workflows/build-and-deploy-on-pypi.yml @@ -13,7 +13,7 @@ jobs: name: Build and publish PyActiveStorage on PyPi runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up Python 3.13 diff --git a/.github/workflows/create-condalock-file.yml b/.github/workflows/create-condalock-file.yml index 86d67d7f..6a10efb5 100644 --- a/.github/workflows/create-condalock-file.yml +++ b/.github/workflows/create-condalock-file.yml @@ -20,7 +20,7 @@ jobs: name: Create and verify conda lock file for latest Python runs-on: 'ubuntu-latest' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - uses: conda-incubator/setup-miniconda@v3 diff --git a/.github/workflows/install-from-condalock-file.yml b/.github/workflows/install-from-condalock-file.yml index 5ff53225..4448895d 100644 --- a/.github/workflows/install-from-condalock-file.yml +++ b/.github/workflows/install-from-condalock-file.yml @@ -25,7 +25,7 @@ jobs: fail-fast: false name: Linux Python ${{ matrix.python-version }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - uses: conda-incubator/setup-miniconda@v3 diff --git a/.github/workflows/run-test-push.yml b/.github/workflows/run-test-push.yml index 03d61b6f..716bc232 100644 --- a/.github/workflows/run-test-push.yml +++ b/.github/workflows/run-test-push.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false name: Linux Python ${{ matrix.python-version }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - uses: conda-incubator/setup-miniconda@v3 diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index cc24aba7..bb5719c9 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -22,7 +22,7 @@ jobs: fail-fast: false name: Linux Python ${{ matrix.python-version }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - uses: conda-incubator/setup-miniconda@v3 @@ -55,7 +55,7 @@ jobs: fail-fast: false name: OSX Python ${{ matrix.python-version }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - uses: conda-incubator/setup-miniconda@v3 diff --git a/.github/workflows/test_s3_minio.yml b/.github/workflows/test_s3_minio.yml index ca586297..35f2bbd7 100644 --- a/.github/workflows/test_s3_minio.yml +++ b/.github/workflows/test_s3_minio.yml @@ -26,7 +26,7 @@ jobs: fail-fast: false name: Linux Python ${{ matrix.python-version }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - uses: conda-incubator/setup-miniconda@v3 @@ -90,10 +90,10 @@ jobs: - name: Stop minio object storage run: tests/s3_exploratory/minio_scripts/minio-stop if: always() - - name: Upload HTML report artifact - uses: actions/upload-artifact@v4 - with: - name: html-report - path: test-reports/ - overwrite: true - if: always() + #- name: Upload HTML report artifact + # uses: actions/upload-artifact@v4 + # with: + # name: html-report + # path: test-reports/ + # overwrite: true + # if: always() From 412607edb959c09b1989033d5e8eb087f2e1522f Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Wed, 5 Mar 2025 15:53:30 +0000 Subject: [PATCH 4/4] unrun GHA --- .github/workflows/test_s3_minio.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test_s3_minio.yml b/.github/workflows/test_s3_minio.yml index 35f2bbd7..4c9a3ef5 100644 --- a/.github/workflows/test_s3_minio.yml +++ b/.github/workflows/test_s3_minio.yml @@ -6,8 +6,7 @@ on: push: branches: - main # keep this at all times - # - pyfive # reinstate - - tlc1 + - pyfive pull_request: schedule: - cron: '0 0 * * *' # nightly