From ca5e508ce0be9f7ccbb8310f25f0a3388364e03f Mon Sep 17 00:00:00 2001 From: Jacob Williams Date: Tue, 18 Mar 2025 12:50:43 -0500 Subject: [PATCH 1/7] in CI, use single-commit: true to only keep latest commit of deployed docs in gh-pages branch Fixes #86 --- .github/workflows/CI.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 4017180..16b9a7f 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -279,7 +279,8 @@ jobs: - name: Deploy Documentation if: ${{ github.event_name == 'push' && steps.deploy-on-push.outputs.result != 0 }} - uses: JamesIves/github-pages-deploy-action@4.1.0 + uses: JamesIves/github-pages-deploy-action@v4.7.3 with: branch: gh-pages # The branch the action should deploy to. folder: doc # The folder the action should deploy. + single-commit: true From d67091b4a4e3eb2c2089bebfc4b16e627928a3fa Mon Sep 17 00:00:00 2001 From: Jacob Williams Date: Tue, 18 Mar 2025 12:56:56 -0500 Subject: [PATCH 2/7] CI: update checkout and cache versions --- .github/workflows/CI.yml | 10 +++++----- .github/workflows/wheel.yml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 16b9a7f..3180a37 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -27,14 +27,14 @@ jobs: FPM_CC: gcc steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4.2.2 with: submodules: recursive - name: Cache GFortran install if: ${{ contains(matrix.os, 'windows') }} id: cache - uses: actions/cache@v2 + uses: actions/cache@v4.2.2 with: path: ./mingw-w64 key: gcc-${{ matrix.gcc }}-${{ matrix.os }} @@ -164,12 +164,12 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4.2.2 - name: Cache GFortran install if: ${{ contains(matrix.os, 'windows') }} id: cache - uses: actions/cache@v2 + uses: actions/cache@v4.2.2 with: path: ./mingw-w64 key: gcc-${{ matrix.gcc }}-${{ matrix.os }} @@ -265,7 +265,7 @@ jobs: DEPLOY_BRANCH: ${{ secrets.DEPLOY_BRANCH && contains(github.ref, secrets.DEPLOY_BRANCH) && 1 || 0 }} - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4.2.2 with: submodules: recursive diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml index a0ff6dc..6383939 100644 --- a/.github/workflows/wheel.yml +++ b/.github/workflows/wheel.yml @@ -6,7 +6,7 @@ jobs: sdist: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4.2.2 - name: Reorganize repository run: | git config user.email "" From d23ec810b48a0bc23349b7fef6f0d8950c91dea3 Mon Sep 17 00:00:00 2001 From: Jacob Williams Date: Tue, 18 Mar 2025 13:00:24 -0500 Subject: [PATCH 3/7] CI: update upload-artifact and download-artifact --- .github/workflows/CI.yml | 4 ++-- .github/workflows/wheel.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 3180a37..086aa96 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -125,7 +125,7 @@ jobs: - name: Upload package if: ${{ matrix.build == 'meson' && matrix.build-type != 'coverage' }} - uses: actions/upload-artifact@v2 + uses: echapmanFromBunnings/upload-artifact@3.0.0 with: name: ${{ env.MINPACK_OUTPUT }} path: ${{ env.MINPACK_OUTPUT }} @@ -207,7 +207,7 @@ jobs: DOWNLOAD: "https://github.com/brechtsanders/winlibs_mingw/releases/download/10.3.0-12.0.0-9.0.0-r2/winlibs-x86_64-posix-seh-gcc-10.3.0-mingw-w64-9.0.0-r2.zip" - name: Download package - uses: actions/download-artifact@v2 + uses: aochmann/actions-download-artifact@1.0.4 with: name: ${{ env.MINPACK_OUTPUT }} diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml index 6383939..01d20d4 100644 --- a/.github/workflows/wheel.yml +++ b/.github/workflows/wheel.yml @@ -17,7 +17,7 @@ jobs: - run: | pipx run build . --sdist working-directory: python - - uses: actions/upload-artifact@v3 + - uses: echapmanFromBunnings/upload-artifact@3.0.0 with: name: minpack-python-sdist path: python/dist/*.tar.gz @@ -58,7 +58,7 @@ jobs: unzip wheel - name: Download sdist - uses: actions/download-artifact@v2 + uses: aochmann/actions-download-artifact@1.0.4 with: name: minpack-python-sdist - name: Build wheel @@ -72,7 +72,7 @@ jobs: rm minpack-*/dist/*-linux_x86_64.whl env: plat: manylinux${{ matrix.python == '3.6' && '2010' || '_2_12' }}_x86_64 - - uses: actions/upload-artifact@v3 + - uses: echapmanFromBunnings/upload-artifact@3.0.0 with: name: minpack-python-${{ matrix.python }} path: minpack-*/dist/*.whl From 3adc360ececf234384c72dc826d5f28d3470a73d Mon Sep 17 00:00:00 2001 From: Jacob Williams Date: Tue, 18 Mar 2025 13:05:13 -0500 Subject: [PATCH 4/7] CI: action version updates --- .github/workflows/CI.yml | 8 ++++---- .github/workflows/wheel.yml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 086aa96..2aef9ec 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -125,14 +125,14 @@ jobs: - name: Upload package if: ${{ matrix.build == 'meson' && matrix.build-type != 'coverage' }} - uses: echapmanFromBunnings/upload-artifact@3.0.0 + uses: actions/upload-artifact@v4.6.1 with: name: ${{ env.MINPACK_OUTPUT }} path: ${{ env.MINPACK_OUTPUT }} - name: Upload coverage report if: ${{ matrix.build-type == 'coverage' }} - uses: codecov/codecov-action@v2 + uses: codecov/codecov-action@v5.4.0 Python: @@ -207,7 +207,7 @@ jobs: DOWNLOAD: "https://github.com/brechtsanders/winlibs_mingw/releases/download/10.3.0-12.0.0-9.0.0-r2/winlibs-x86_64-posix-seh-gcc-10.3.0-mingw-w64-9.0.0-r2.zip" - name: Download package - uses: aochmann/actions-download-artifact@1.0.4 + uses: actions/download-artifact@v4.2.0 with: name: ${{ env.MINPACK_OUTPUT }} @@ -249,7 +249,7 @@ jobs: DYLD_LIBRARY_PATH: ${{ env.DYLD_LIBRARY_PATH }}:${{ env.MINPACK_PREFIX }}/lib - name: Upload coverage report - uses: codecov/codecov-action@v2 + uses: codecov/codecov-action@v5.4.0 Docs: diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml index 01d20d4..747341d 100644 --- a/.github/workflows/wheel.yml +++ b/.github/workflows/wheel.yml @@ -17,7 +17,7 @@ jobs: - run: | pipx run build . --sdist working-directory: python - - uses: echapmanFromBunnings/upload-artifact@3.0.0 + - uses: actions/upload-artifact@v4.6.1 with: name: minpack-python-sdist path: python/dist/*.tar.gz @@ -58,7 +58,7 @@ jobs: unzip wheel - name: Download sdist - uses: aochmann/actions-download-artifact@1.0.4 + uses: actions/download-artifact@v4.2.0 with: name: minpack-python-sdist - name: Build wheel @@ -72,7 +72,7 @@ jobs: rm minpack-*/dist/*-linux_x86_64.whl env: plat: manylinux${{ matrix.python == '3.6' && '2010' || '_2_12' }}_x86_64 - - uses: echapmanFromBunnings/upload-artifact@3.0.0 + - uses: actions/upload-artifact@v4.6.1 with: name: minpack-python-${{ matrix.python }} path: minpack-*/dist/*.whl From d44f03be42648c4eac193ed3ce01e360d4fdce27 Mon Sep 17 00:00:00 2001 From: Jacob Williams Date: Wed, 19 Mar 2025 08:54:44 -0500 Subject: [PATCH 5/7] CI: more updates switch from setup-micromamba to provision-with-micromamba updating gcc to 14 update python matrix to 3.10-3.12 --- .github/workflows/CI.yml | 32 +++++++++++++++----------------- .github/workflows/wheel.yml | 2 +- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 2aef9ec..c637645 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -9,12 +9,12 @@ jobs: matrix: build: [fpm, meson] os: [ubuntu-latest, macos-latest, windows-latest] - gcc: [10] # Version of GFortran we want to use. + gcc: [14] # Version of GFortran we want to use. build-type: [debug] include: - build: meson os: ubuntu-latest - gcc: 10 + gcc: 14 build-type: coverage defaults: @@ -50,7 +50,7 @@ jobs: if: ${{ contains(matrix.os, 'ubuntu') }} run: | sudo update-alternatives \ - --install /usr/bin/gcc gcc /usr/bin/gcc-${{ matrix.gcc }} 100 \ + --install /usr/bin/gcc gcc /usr/bin/gcc-${{ matrix.gcc }} 140 \ --slave /usr/bin/gfortran gfortran /usr/bin/gfortran-${{ matrix.gcc }} \ --slave /usr/bin/gcov gcov /usr/bin/gcov-${{ matrix.gcc }} @@ -62,14 +62,13 @@ jobs: echo "$pwd\mingw-w64\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append shell: pwsh env: - DOWNLOAD: "https://github.com/brechtsanders/winlibs_mingw/releases/download/10.3.0-12.0.0-9.0.0-r2/winlibs-x86_64-posix-seh-gcc-10.3.0-mingw-w64-9.0.0-r2.zip" + DOWNLOAD: "https://github.com/brechtsanders/winlibs_mingw/releases/download/14.2.0win32-12.0.0-msvcrt-r1/winlibs-x86_64-win32-seh-gcc-14.2.0-mingw-w64msvcrt-12.0.0-r1.zip" - name: Install dependencies - uses: mamba-org/provision-with-micromamba@main + uses: mamba-org/setup-micromamba@v2.0.4 with: environment-file: config/ci/${{ matrix.build }}-env.yaml - extra-specs: | - ${{ matrix.build-type == 'coverage' && 'gcovr' || '' }} + create-args: ${{ matrix.build-type == 'coverage' && 'gcovr' || '' }} - name: Compile (fpm) if: ${{ matrix.build == 'fpm' }} @@ -147,15 +146,15 @@ jobs: matrix: build: [meson] os: [ubuntu-latest, macos-latest] - gcc: [10] - python: ['3.7', '3.8', '3.9'] + gcc: [14] + python: ['3.10', '3.11', '3.12'] # Additional test for setuptools build include: - build: setuptools os: ubuntu-latest - gcc: 10 - python: '3.9' + gcc: 14 + python: '3.12' env: FC: gfortran @@ -175,11 +174,10 @@ jobs: key: gcc-${{ matrix.gcc }}-${{ matrix.os }} - name: Install dependencies - uses: mamba-org/provision-with-micromamba@main + uses: mamba-org/setup-micromamba@v2.0.4 with: environment-file: config/ci/python-env.yaml - extra-specs: | - python=${{ matrix.python }} + create-args: python=${{ matrix.python }} - name: Install GFortran (MacOS) if: ${{ contains(matrix.os, 'macos') }} @@ -192,7 +190,7 @@ jobs: if: ${{ contains(matrix.os, 'ubuntu') }} run: | sudo update-alternatives \ - --install /usr/bin/gcc gcc /usr/bin/gcc-${{ matrix.gcc }} 100 \ + --install /usr/bin/gcc gcc /usr/bin/gcc-${{ matrix.gcc }} 140 \ --slave /usr/bin/gfortran gfortran /usr/bin/gfortran-${{ matrix.gcc }} \ --slave /usr/bin/gcov gcov /usr/bin/gcov-${{ matrix.gcc }} @@ -204,7 +202,7 @@ jobs: echo "$pwd\mingw-w64\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append shell: pwsh env: - DOWNLOAD: "https://github.com/brechtsanders/winlibs_mingw/releases/download/10.3.0-12.0.0-9.0.0-r2/winlibs-x86_64-posix-seh-gcc-10.3.0-mingw-w64-9.0.0-r2.zip" + DOWNLOAD: "https://github.com/brechtsanders/winlibs_mingw/releases/download/14.2.0win32-12.0.0-msvcrt-r1/winlibs-x86_64-win32-seh-gcc-14.2.0-mingw-w64msvcrt-12.0.0-r1.zip" - name: Download package uses: actions/download-artifact@v4.2.0 @@ -270,7 +268,7 @@ jobs: submodules: recursive - name: Install dependencies - uses: mamba-org/provision-with-micromamba@main + uses: mamba-org/setup-micromamba@v2.0.4 with: environment-file: config/ci/docs-env.yaml diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml index 747341d..584b2a0 100644 --- a/.github/workflows/wheel.yml +++ b/.github/workflows/wheel.yml @@ -31,7 +31,7 @@ jobs: strategy: fail-fast: false matrix: - python: ['3.7', '3.8', '3.9', '3.10'] + python: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12'] defaults: run: From 3033a534716821b734b922ed99daeb984f69d7f5 Mon Sep 17 00:00:00 2001 From: Jacob Williams Date: Thu, 20 Mar 2025 09:28:13 -0500 Subject: [PATCH 6/7] CI mod --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index c637645..6a1fd2f 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -50,7 +50,7 @@ jobs: if: ${{ contains(matrix.os, 'ubuntu') }} run: | sudo update-alternatives \ - --install /usr/bin/gcc gcc /usr/bin/gcc-${{ matrix.gcc }} 140 \ + --install /usr/bin/gcc gcc /usr/bin/gcc-${{ matrix.gcc }} 100 \ --slave /usr/bin/gfortran gfortran /usr/bin/gfortran-${{ matrix.gcc }} \ --slave /usr/bin/gcov gcov /usr/bin/gcov-${{ matrix.gcc }} @@ -190,7 +190,7 @@ jobs: if: ${{ contains(matrix.os, 'ubuntu') }} run: | sudo update-alternatives \ - --install /usr/bin/gcc gcc /usr/bin/gcc-${{ matrix.gcc }} 140 \ + --install /usr/bin/gcc gcc /usr/bin/gcc-${{ matrix.gcc }} 100 \ --slave /usr/bin/gfortran gfortran /usr/bin/gfortran-${{ matrix.gcc }} \ --slave /usr/bin/gcov gcov /usr/bin/gcov-${{ matrix.gcc }} From 4a06c6d0f04d5d2fcf164fd8fe53821ad5b2622c Mon Sep 17 00:00:00 2001 From: Jacob Williams Date: Thu, 20 Mar 2025 10:43:31 -0500 Subject: [PATCH 7/7] CI: try gcc13 --- .github/workflows/CI.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 6a1fd2f..196e516 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -9,12 +9,12 @@ jobs: matrix: build: [fpm, meson] os: [ubuntu-latest, macos-latest, windows-latest] - gcc: [14] # Version of GFortran we want to use. + gcc: [13] # Version of GFortran we want to use. build-type: [debug] include: - build: meson os: ubuntu-latest - gcc: 14 + gcc: 13 build-type: coverage defaults: @@ -62,7 +62,7 @@ jobs: echo "$pwd\mingw-w64\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append shell: pwsh env: - DOWNLOAD: "https://github.com/brechtsanders/winlibs_mingw/releases/download/14.2.0win32-12.0.0-msvcrt-r1/winlibs-x86_64-win32-seh-gcc-14.2.0-mingw-w64msvcrt-12.0.0-r1.zip" + DOWNLOAD: "https://github.com/brechtsanders/winlibs_mingw/releases/download/13.3.0posix-11.0.1-ucrt-r1/winlibs-x86_64-posix-seh-gcc-13.3.0-mingw-w64ucrt-11.0.1-r1.zip" - name: Install dependencies uses: mamba-org/setup-micromamba@v2.0.4 @@ -146,14 +146,14 @@ jobs: matrix: build: [meson] os: [ubuntu-latest, macos-latest] - gcc: [14] + gcc: [13] python: ['3.10', '3.11', '3.12'] # Additional test for setuptools build include: - build: setuptools os: ubuntu-latest - gcc: 14 + gcc: 13 python: '3.12' env: @@ -202,7 +202,7 @@ jobs: echo "$pwd\mingw-w64\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append shell: pwsh env: - DOWNLOAD: "https://github.com/brechtsanders/winlibs_mingw/releases/download/14.2.0win32-12.0.0-msvcrt-r1/winlibs-x86_64-win32-seh-gcc-14.2.0-mingw-w64msvcrt-12.0.0-r1.zip" + DOWNLOAD: "https://github.com/brechtsanders/winlibs_mingw/releases/download/13.3.0posix-11.0.1-ucrt-r1/winlibs-x86_64-posix-seh-gcc-13.3.0-mingw-w64ucrt-11.0.1-r1.zip" - name: Download package uses: actions/download-artifact@v4.2.0