From 91a5277b800a10ce209f1ef330f885b4a7275596 Mon Sep 17 00:00:00 2001 From: Lloyd Izard <76954858+LOCEANlloydizard@users.noreply.github.com> Date: Thu, 8 Jan 2026 12:49:25 -0500 Subject: [PATCH 1/2] Update pr.yaml - change 'file' to 'files' - set Codecov fail_ci_if_error=true to surface potential other errors --- .github/workflows/pr.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 46cdec27e..03207c9fe 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -146,7 +146,7 @@ jobs: - name: Upload code coverage to Codecov uses: codecov/codecov-action@v5 with: - file: ./coverage.xml + files: ./coverage.xml flags: unittests env_vars: RUNNER_OS,PYTHON_VERSION name: codecov-umbrella @@ -204,11 +204,11 @@ jobs: - name: Upload code coverage uses: codecov/codecov-action@v5 with: - file: ./coverage.xml + files: ./coverage.xml flags: unittests env_vars: RUNNER_OS name: codecov-windows - fail_ci_if_error: false + fail_ci_if_error: true - name: Teardown services if: always() From f9fedc81e7f97c743b786e1a433f801ada10111c Mon Sep 17 00:00:00 2001 From: Lloyd Izard <76954858+LOCEANlloydizard@users.noreply.github.com> Date: Thu, 8 Jan 2026 13:13:00 -0500 Subject: [PATCH 2/2] CI: fix deprecated workflow inputs and Codecov v5 usage - Replace deprecated inputs (e.g. file -> files, repository_url -> repository-url) - Fix invalid GitHub Actions if-expression syntax - Enable fail_ci_if_error to surface CI issues - Delete windows disabled workflow files --- .github/workflows/build.yaml | 2 +- .github/workflows/pypi.yaml | 6 +- .github/workflows/windows-utils.yaml | 69 ----------------------- .github/workflows/windows.yaml | 83 ---------------------------- 4 files changed, 4 insertions(+), 156 deletions(-) delete mode 100644 .github/workflows/windows-utils.yaml delete mode 100644 .github/workflows/windows.yaml diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 6912fdb84..5ecd2d000 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -153,7 +153,7 @@ jobs: - name: Upload code coverage to Codecov uses: codecov/codecov-action@v5 with: - file: ./coverage.xml + files: ./coverage.xml flags: unittests env_vars: RUNNER_OS,PYTHON_VERSION name: codecov-umbrella diff --git a/.github/workflows/pypi.yaml b/.github/workflows/pypi.yaml index 7c4d20319..6b4270b1c 100644 --- a/.github/workflows/pypi.yaml +++ b/.github/workflows/pypi.yaml @@ -33,7 +33,7 @@ jobs: # This step is only necessary for testing purposes and for TestPyPI - name: Fix up version string for TestPyPI - if: ${{ !startsWith(github.ref, 'refs/tags') }} || github.event_name == 'workflow_dispatch' + if: ${{ !startsWith(github.ref, 'refs/tags') || github.event_name == 'workflow_dispatch' }} run: | # Change setuptools-scm local_scheme to "no-local-version" so the # local part of the version isn't included, making the version string @@ -72,9 +72,9 @@ jobs: uses: pypa/gh-action-pypi-publish@v1.13.0 with: password: ${{ secrets.TEST_PYPI_API_TOKEN }} - repository_url: https://test.pypi.org/legacy/ + repository-url: https://test.pypi.org/legacy/ verbose: true - skip_existing: true + skip-existing: true - name: Check pypi packages run: | sleep 3 diff --git a/.github/workflows/windows-utils.yaml b/.github/workflows/windows-utils.yaml deleted file mode 100644 index 6c53440ea..000000000 --- a/.github/workflows/windows-utils.yaml +++ /dev/null @@ -1,69 +0,0 @@ -name: windows-utils-test - -on: - push: - paths-ignore: [".ci_helpers/docker/**", "**/docker.yaml"] - pull_request: - paths-ignore: [".ci_helpers/docker/**", "**/docker.yaml"] - pull_request_target: - paths-ignore: [".ci_helpers/docker/**", "**/docker.yaml"] - workflow_dispatch: - -env: - CONDA_ENV: echopype - -jobs: - windows-test: - name: windows-${{ matrix.python-version }}-build - runs-on: "windows-latest" - continue-on-error: ${{ matrix.experimental }} - strategy: - fail-fast: false - matrix: - include: - - python-version: 3.12 - experimental: false - defaults: - run: - shell: powershell - steps: - - name: Checkout repo - uses: actions/checkout@v6 - with: - fetch-depth: 0 # Fetch all history for all branches and tags. - - name: Set environment variables - run: | - echo "PYTHON_VERSION=${{ matrix.python-version }}" >> $GITHUB_ENV - - name: Setup miniconda w/mamba - uses: conda-incubator/setup-miniconda@v3 - with: - python-version: ${{ matrix.python-version }} - mamba-version: "*" - channels: conda-forge,defaults - channel-priority: true - activate-environment: ${{ env.CONDA_ENV }} - environment-file: .ci_helpers/py${{ matrix.python-version }}.yaml - # Currently problematic! See https://github.com/mamba-org/mamba/issues/2157 - # - name: Setup micromamba - # uses: mamba-org/provision-with-micromamba@v15 - # with: - # environment-file: .ci_helpers/py${{ matrix.python-version }}.yaml - # environment-name: ${{ env.CONDA_ENV }} - # cache-env: true - # cache-env-key: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{ hashFiles(format('.ci_helpers/py{0}.yaml', matrix.python-version)) }} - - name: Print conda info - run: | - conda info - conda list - conda config --show-sources - conda config --show - printenv | sort - - name: Install dev tools - run: | - mamba install -c conda-forge -n ${{ env.CONDA_ENV }} --yes --file requirements-dev.txt - - name: Install echopype - run: | - python -m pip install -e . - - name: Running all Tests - run: | - pytest -vvv -rx --cov=echopype --cov-report=xml --log-cli-level=WARNING --disable-warnings echopype/tests/utils |& tee ci_${{ matrix.python-version }}_test_log.log diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml deleted file mode 100644 index 889fb6188..000000000 --- a/.github/workflows/windows.yaml +++ /dev/null @@ -1,83 +0,0 @@ -name: windows-build - -on: - push: - branches: - - dev - - main - paths-ignore: [".ci_helpers/docker/**", "**/docker.yaml"] - workflow_dispatch: - -env: - CONDA_ENV: echopype - -jobs: - windows-test: - name: windows-${{ matrix.python-version }}-build - runs-on: "windows-latest" - continue-on-error: ${{ matrix.experimental }} - strategy: - fail-fast: false - matrix: - include: - - python-version: 3.12 - experimental: false - defaults: - run: - shell: powershell - services: - # TODO: figure out how to update tag when there's a new one - minio: - image: cormorack/minioci:latest - ports: - - 9000:9000 - httpserver: - image: cormorack/http:latest - ports: - - 8080:80 - steps: - - name: Checkout repo - uses: actions/checkout@v6 - - name: Copying test data to http server - run: | - rm .\echopype\test_data -r -fo - docker cp -L ${{ job.services.httpserver.id }}:/usr/local/apache2/htdocs/data .\echopype\test_data - - # Check data endpoint - curl http://localhost:8080/data/ - - name: Setup Python - uses: actions/setup-python@v6.1.0 - with: - python-version: ${{ matrix.python-version }} - architecture: x64 - - name: Cache conda - uses: actions/cache@v5 - env: - # Increase this value to reset cache if '.ci_helpers/py{0}.yaml' has not changed - CACHE_NUMBER: 0 - with: - path: ~/conda_pkgs_dir - key: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{ hashFiles(format('.ci_helpers/py{0}.yaml', matrix.python-version)) }} - - name: Setup miniconda - uses: conda-incubator/setup-miniconda@v3 - with: - activate-environment: ${{ env.CONDA_ENV }} - environment-file: .ci_helpers/py${{ matrix.python-version }}.yaml - miniforge-variant: Mambaforge - miniforge-version: 4.11.0-0 - use-mamba: true - auto-activate-base: false - use-only-tar-bz2: true - - name: Print conda env - run: | - conda info - conda list - - name: Install dev tools - run: | - mamba install -c conda-forge --yes --file requirements-dev.txt - - name: Install echopype - run: | - python -m pip install -e .[plot] - - name: Running all Tests - run: | - pytest -vvv -rx --numprocesses=4 --cov=echopype --cov-report=xml --log-cli-level=WARNING --disable-warnings |& tee ci_${{ matrix.python-version }}_test_log.log