From 5974456cf75074b591978be83447e9fc6821e7e0 Mon Sep 17 00:00:00 2001 From: Ben Date: Sun, 4 Jan 2026 09:22:36 +0100 Subject: [PATCH 01/10] Revert "No need to fetch tag etc, see comment" This reverts commit 942039e5f2e8e65c7eb5be611ca2e6d1ad6e4265. --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c76b130d..f1bbe54b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -78,10 +78,10 @@ jobs: echo "No release found for $TAG." fi - # Note that since this is a draft the link will be untagged (see https://github.com/cli/cli/issues/11589) - name: Create draft release if: ${{ steps.release_info.outputs.tag }} run: | + git fetch --tags --force gh release create "${{ steps.release_info.outputs.tag }}" \ --repo "$GITHUB_REPOSITORY" \ --title "${{ steps.release_info.outputs.tag }}" \ From c872b2a4c18501c50a0a72cee43e534c761cb6b0 Mon Sep 17 00:00:00 2001 From: Ben Date: Sun, 4 Jan 2026 09:22:36 +0100 Subject: [PATCH 02/10] Revert "Setup python before checkout to not interfere with repo" This reverts commit bb4af29fb6ea1a5d36d0755db561095405bac3e8. --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f1bbe54b..0324864f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,13 +24,13 @@ jobs: - uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0 with: egress-policy: audit - - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0 - with: - python-version: '3.13' - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 with: fetch-depth: 0 fetch-tags: true + - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0 + with: + python-version: '3.13' - name: Determine release info id: release_info From 0728a121ebaf7b40e3f5fe8193e6110fed77b1e5 Mon Sep 17 00:00:00 2001 From: Ben Date: Sun, 4 Jan 2026 09:22:36 +0100 Subject: [PATCH 03/10] Revert "Overwrite the local tag" This reverts commit cdff4b972a31cfff9556bd32052cde572cadb858. --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0324864f..f8685562 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -81,7 +81,7 @@ jobs: - name: Create draft release if: ${{ steps.release_info.outputs.tag }} run: | - git fetch --tags --force + git fetch --tags gh release create "${{ steps.release_info.outputs.tag }}" \ --repo "$GITHUB_REPOSITORY" \ --title "${{ steps.release_info.outputs.tag }}" \ From b991c2b39ad63447ea233c78358e0ec9bc38bde5 Mon Sep 17 00:00:00 2001 From: Ben Date: Sun, 4 Jan 2026 09:22:36 +0100 Subject: [PATCH 04/10] Revert "Refresh just before creating release" This reverts commit 02213bf644e09576c078c5c328ddcf40e07b8f1c. --- .github/workflows/release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f8685562..c0de606f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -81,7 +81,6 @@ jobs: - name: Create draft release if: ${{ steps.release_info.outputs.tag }} run: | - git fetch --tags gh release create "${{ steps.release_info.outputs.tag }}" \ --repo "$GITHUB_REPOSITORY" \ --title "${{ steps.release_info.outputs.tag }}" \ From d8700a07da171fb5b1f3405241793b3860b5964c Mon Sep 17 00:00:00 2001 From: Ben Date: Sun, 4 Jan 2026 09:22:36 +0100 Subject: [PATCH 05/10] Revert "Verify the tag" This reverts commit 92e886a87c6d6ff1cf92f5f25e72afff7a2bfeee. --- .github/workflows/release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c0de606f..3e3036b2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -86,7 +86,6 @@ jobs: --title "${{ steps.release_info.outputs.tag }}" \ --notes-file release_notes.txt \ --draft \ - --verify-tag \ LICENSE env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From d94c30d175c1d59462842571d40204a0bc8db062 Mon Sep 17 00:00:00 2001 From: Ben Date: Sun, 4 Jan 2026 09:22:36 +0100 Subject: [PATCH 06/10] Revert "Make sure gh release operates on correct repo" This reverts commit 42364f2e2e2955c3da8f933712ec1c7019068eed. --- .github/workflows/release.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3e3036b2..f8a98e4d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -82,10 +82,9 @@ jobs: if: ${{ steps.release_info.outputs.tag }} run: | gh release create "${{ steps.release_info.outputs.tag }}" \ - --repo "$GITHUB_REPOSITORY" \ - --title "${{ steps.release_info.outputs.tag }}" \ - --notes-file release_notes.txt \ - --draft \ + --title "${{ steps.release_info.outputs.tag }}" \ + --notes-file release_notes.txt \ + --draft \ LICENSE env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From b5097f70213cbb3d490c32f2c503c4c9737e723c Mon Sep 17 00:00:00 2001 From: Ben Date: Sun, 4 Jan 2026 09:22:36 +0100 Subject: [PATCH 07/10] Revert "--clobber should be last arg" This reverts commit 208f208bef9cb50030d138dfc58508b41b026006. --- .github/workflows/build.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d6d04dbe..738f61e3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -104,15 +104,14 @@ jobs: - name: Upload installer to release ⬆️ if: ${{ inputs.release_id }} - shell: bash - run: gh release upload \ - "${{ inputs.release_id }}" \ - build/dfetch-package/*.deb \ - build/dfetch-package/*.rpm \ - build/dfetch-package/*.pkg \ - build/dfetch-package/*.msi \ - build/dfetch-package/*.cdx.json \ - --clobber + run: gh release upload \ + "${{ inputs.release_id }}" \ + --clobber \ + build/dfetch-package/*.deb \ + build/dfetch-package/*.rpm \ + build/dfetch-package/*.pkg \ + build/dfetch-package/*.msi \ + build/dfetch-package/*.cdx.json env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 1a132072cebaba78c0cc580487f7be7511fb7fd3 Mon Sep 17 00:00:00 2001 From: Ben Date: Sun, 4 Jan 2026 09:22:36 +0100 Subject: [PATCH 08/10] Revert "Make sure we have tag info when creating release" This reverts commit 02e3cae5fe9db2c869ffb5d3fa0d5189abba7a7d. --- .github/workflows/release.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f8a98e4d..544bddc5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,9 +25,6 @@ jobs: with: egress-policy: audit - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 - with: - fetch-depth: 0 - fetch-tags: true - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0 with: python-version: '3.13' From 54163d5ada4bb66ab2dcb584b3016f5b8f839e63 Mon Sep 17 00:00:00 2001 From: Ben Date: Sun, 4 Jan 2026 09:22:36 +0100 Subject: [PATCH 09/10] Revert "Use official gh release tool for uploading artifacts as well" This reverts commit d2fae3093e1955f7b678e5c03d13d4ccead87103. --- .github/workflows/build.yml | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 738f61e3..1190d301 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -102,16 +102,19 @@ jobs: build/dfetch-package/*.msi build/dfetch-package/*.cdx.json - - name: Upload installer to release ⬆️ + - name: Upload installer to release if: ${{ inputs.release_id }} - run: gh release upload \ - "${{ inputs.release_id }}" \ - --clobber \ - build/dfetch-package/*.deb \ - build/dfetch-package/*.rpm \ - build/dfetch-package/*.pkg \ - build/dfetch-package/*.msi \ + uses: softprops/action-gh-release@5122b4edc95f85501a71628a57dc180a03ec7588 # v2.5.0 + with: + tag_name: ${{ inputs.release_id }} + files: | + build/dfetch-package/*.deb + build/dfetch-package/*.rpm + build/dfetch-package/*.pkg + build/dfetch-package/*.msi build/dfetch-package/*.cdx.json + draft: true + preserve_order: true env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -210,7 +213,12 @@ jobs: with: name: python-package-distributions path: dist/ - - name: Upload artifacts to release ⬆️ - run: gh release upload "${{ inputs.release_id }}" dist/* --clobber + - name: Upload artifacts to release + uses: softprops/action-gh-release@5122b4edc95f85501a71628a57dc180a03ec7588 # v2.5.0 + with: + tag_name: ${{ inputs.release_id }} + files: dist/* + draft: true + preserve_order: true env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 89721962220819daf962424a0a27d508867d44c6 Mon Sep 17 00:00:00 2001 From: Ben Date: Sun, 4 Jan 2026 09:22:36 +0100 Subject: [PATCH 10/10] Revert "Use official github tool" This reverts commit 83785805c9f80255cf049838c72de3609ec13686. --- .github/workflows/release.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 544bddc5..4278b944 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -75,13 +75,14 @@ jobs: echo "No release found for $TAG." fi - - name: Create draft release + - name: Create release if: ${{ steps.release_info.outputs.tag }} - run: | - gh release create "${{ steps.release_info.outputs.tag }}" \ - --title "${{ steps.release_info.outputs.tag }}" \ - --notes-file release_notes.txt \ - --draft \ - LICENSE + uses: softprops/action-gh-release@5122b4edc95f85501a71628a57dc180a03ec7588 # v2.5.0 + with: + tag_name: ${{ steps.release_info.outputs.tag }} + name: ${{ steps.release_info.outputs.tag }} + body_path: release_notes.txt + draft: true + files: LICENSE env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}