From d8ee535c630dd48c1931a0693587df2e05632358 Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Mon, 1 Dec 2025 06:38:30 -0800 Subject: [PATCH 1/5] ci: pdffit2 hard-code matrix test --- .github/workflows/_build-python-wheel-extension.yml | 10 +++++++--- .github/workflows/_build-wheel.yml | 2 -- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/_build-python-wheel-extension.yml b/.github/workflows/_build-python-wheel-extension.yml index 94eacc7..89f029d 100644 --- a/.github/workflows/_build-python-wheel-extension.yml +++ b/.github/workflows/_build-python-wheel-extension.yml @@ -67,7 +67,9 @@ jobs: - macos-14 - windows-latest python: - - ${{ inputs.python_version }} + - "3.12" + - "3.13" + - "3.14" steps: - name: Check out @@ -160,7 +162,7 @@ jobs: run: shell: bash -l {0} - name: test-wheels-${{ inputs.python_version }}-${{ matrix.buildplat }} + name: test-wheels-${{ matrix.python }}-${{ matrix.buildplat }} runs-on: ${{ matrix.buildplat }} strategy: fail-fast: false @@ -171,7 +173,9 @@ jobs: - macos-14 - windows-latest python: - - ${{ inputs.python_version }} + - "3.12" + - "3.13" + - "3.14" steps: - name: Check out diff --git a/.github/workflows/_build-wheel.yml b/.github/workflows/_build-wheel.yml index 5c32cfb..c0b5196 100644 --- a/.github/workflows/_build-wheel.yml +++ b/.github/workflows/_build-wheel.yml @@ -31,5 +31,3 @@ jobs: with: project: ${{ inputs.project }} python_version: ${{ inputs.python_version }} - -# anything else From ba5bc18124da30aff3e4cc412098cbd218040ccb Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Mon, 1 Dec 2025 06:42:17 -0800 Subject: [PATCH 2/5] revert to previous commit --- .github/workflows/_build-python-wheel-extension.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/_build-python-wheel-extension.yml b/.github/workflows/_build-python-wheel-extension.yml index 89f029d..b783542 100644 --- a/.github/workflows/_build-python-wheel-extension.yml +++ b/.github/workflows/_build-python-wheel-extension.yml @@ -56,7 +56,7 @@ jobs: run: shell: bash -l {0} - name: cibw-wheels-${{ inputs.python_version }}-${{ matrix.buildplat }} + name: cibw-wheels-${{ matrix.python }}-${{ matrix.buildplat }} runs-on: ${{ matrix.buildplat }} strategy: fail-fast: false From 49c83813b3b16125ffb56246b5c81382ab5d3f44 Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Mon, 1 Dec 2025 06:48:08 -0800 Subject: [PATCH 3/5] uncomment rest for testing --- .../workflows/_build-wheel-release-upload.yml | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/_build-wheel-release-upload.yml b/.github/workflows/_build-wheel-release-upload.yml index 81f9a6e..77f3495 100644 --- a/.github/workflows/_build-wheel-release-upload.yml +++ b/.github/workflows/_build-wheel-release-upload.yml @@ -51,26 +51,26 @@ jobs: # Convert from number to string python_version: ${{ fromJSON(needs.get-python-version.outputs.python_version) }} - release-github: - needs: [build-wheel] - uses: ./.github/workflows/_release-github.yml - secrets: - PAT_TOKEN: ${{ secrets.PAT_TOKEN }} + # release-github: + # needs: [build-wheel] + # uses: ./.github/workflows/_release-github.yml + # secrets: + # PAT_TOKEN: ${{ secrets.PAT_TOKEN }} - release-pypi: - needs: [release-github, get-python-version] - uses: ./.github/workflows/_release-pypi.yml - with: - # Convert from number to string - python_version: ${{ fromJSON(needs.get-python-version.outputs.python_version) }} - secrets: - PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} + # release-pypi: + # needs: [release-github, get-python-version] + # uses: ./.github/workflows/_release-pypi.yml + # with: + # # Convert from number to string + # python_version: ${{ fromJSON(needs.get-python-version.outputs.python_version) }} + # secrets: + # PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} - docs-release: - needs: [release-github, get-python-version] - uses: ./.github/workflows/_release-docs.yml - with: - project: ${{ inputs.project }} - c_extension: ${{ inputs.c_extension }} - # Convert from number to string - python_version: ${{ fromJSON(needs.get-python-version.outputs.python_version) }} + # docs-release: + # needs: [release-github, get-python-version] + # uses: ./.github/workflows/_release-docs.yml + # with: + # project: ${{ inputs.project }} + # c_extension: ${{ inputs.c_extension }} + # # Convert from number to string + # python_version: ${{ fromJSON(needs.get-python-version.outputs.python_version) }} From 37c65f75fe0ec43891c1dc593a12160646b8f21d Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Mon, 1 Dec 2025 07:04:53 -0800 Subject: [PATCH 4/5] ci: migrate to macos15 and intel --- .github/workflows/_build-python-wheel-extension.yml | 8 ++++---- .../workflows/_matrix-and-codecov-on-merge-to-main.yml | 2 +- .github/workflows/_matrix-no-codecov-on-merge-to-main.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/_build-python-wheel-extension.yml b/.github/workflows/_build-python-wheel-extension.yml index b783542..859da42 100644 --- a/.github/workflows/_build-python-wheel-extension.yml +++ b/.github/workflows/_build-python-wheel-extension.yml @@ -63,8 +63,8 @@ jobs: matrix: buildplat: - ubuntu-latest - - macos-13 - - macos-14 + - macos-latest + - macos-15-intel - windows-latest python: - "3.12" @@ -169,8 +169,8 @@ jobs: matrix: buildplat: - ubuntu-latest - - macos-13 - - macos-14 + - macos-latest + - macos-15-intel - windows-latest python: - "3.12" diff --git a/.github/workflows/_matrix-and-codecov-on-merge-to-main.yml b/.github/workflows/_matrix-and-codecov-on-merge-to-main.yml index 704f2c6..cdb0786 100644 --- a/.github/workflows/_matrix-and-codecov-on-merge-to-main.yml +++ b/.github/workflows/_matrix-and-codecov-on-merge-to-main.yml @@ -49,7 +49,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest, macos-13, macos-14] + os: [ubuntu-latest, windows-latest, macos-latest, macos-15-intel] python-version: ${{ fromJson(needs.get-python-versions.outputs.python_versions_json) }} steps: - name: Get the latest Python version from the matrix diff --git a/.github/workflows/_matrix-no-codecov-on-merge-to-main.yml b/.github/workflows/_matrix-no-codecov-on-merge-to-main.yml index 3764dd4..4f6f8c6 100644 --- a/.github/workflows/_matrix-no-codecov-on-merge-to-main.yml +++ b/.github/workflows/_matrix-no-codecov-on-merge-to-main.yml @@ -45,7 +45,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest, macos-13, macos-14] + os: [ubuntu-latest, windows-latest, macos-latest, macos-15-intel] python-version: ${{ fromJson(needs.get-python-versions.outputs.python_versions_json) }} steps: - name: Get the latest Python version from the matrix From 5dab1bc4b6c933aadb0b6e90882b8be9b536efd7 Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Mon, 1 Dec 2025 07:13:27 -0800 Subject: [PATCH 5/5] chore: uncomment section for testing --- .../workflows/_build-wheel-release-upload.yml | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/_build-wheel-release-upload.yml b/.github/workflows/_build-wheel-release-upload.yml index 77f3495..81f9a6e 100644 --- a/.github/workflows/_build-wheel-release-upload.yml +++ b/.github/workflows/_build-wheel-release-upload.yml @@ -51,26 +51,26 @@ jobs: # Convert from number to string python_version: ${{ fromJSON(needs.get-python-version.outputs.python_version) }} - # release-github: - # needs: [build-wheel] - # uses: ./.github/workflows/_release-github.yml - # secrets: - # PAT_TOKEN: ${{ secrets.PAT_TOKEN }} + release-github: + needs: [build-wheel] + uses: ./.github/workflows/_release-github.yml + secrets: + PAT_TOKEN: ${{ secrets.PAT_TOKEN }} - # release-pypi: - # needs: [release-github, get-python-version] - # uses: ./.github/workflows/_release-pypi.yml - # with: - # # Convert from number to string - # python_version: ${{ fromJSON(needs.get-python-version.outputs.python_version) }} - # secrets: - # PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} + release-pypi: + needs: [release-github, get-python-version] + uses: ./.github/workflows/_release-pypi.yml + with: + # Convert from number to string + python_version: ${{ fromJSON(needs.get-python-version.outputs.python_version) }} + secrets: + PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} - # docs-release: - # needs: [release-github, get-python-version] - # uses: ./.github/workflows/_release-docs.yml - # with: - # project: ${{ inputs.project }} - # c_extension: ${{ inputs.c_extension }} - # # Convert from number to string - # python_version: ${{ fromJSON(needs.get-python-version.outputs.python_version) }} + docs-release: + needs: [release-github, get-python-version] + uses: ./.github/workflows/_release-docs.yml + with: + project: ${{ inputs.project }} + c_extension: ${{ inputs.c_extension }} + # Convert from number to string + python_version: ${{ fromJSON(needs.get-python-version.outputs.python_version) }}