From f69761cb3123113c0cc5c67f2b3a79c4bd9bcda9 Mon Sep 17 00:00:00 2001 From: Jason Dove <1695733+jasongdove@users.noreply.github.com> Date: Sat, 18 Apr 2026 14:25:53 -0500 Subject: [PATCH] more gh token tweaks --- .github/workflows/artifacts.yml | 64 ++++++++++++++------------------- .github/workflows/ci.yml | 2 +- .github/workflows/docker.yml | 2 +- .github/workflows/release.yml | 2 +- 4 files changed, 29 insertions(+), 41 deletions(-) diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml index 8beb68a1f..a46b328e7 100644 --- a/.github/workflows/artifacts.yml +++ b/.github/workflows/artifacts.yml @@ -128,22 +128,18 @@ jobs: rm -r ErsatzTV-Legacy.app - name: Delete old release assets - uses: mknejp/delete-release-assets@v1 if: ${{ inputs.release_tag == 'develop' }} - with: - token: ${{ secrets.gh_token }} - tag: ${{ inputs.release_tag }} - fail-if-no-assets: false - assets: "*${{ matrix.target }}.dmg" + env: + GH_TOKEN: ${{ secrets.gh_token }} + run: | + gh release view ${{ inputs.release_tag }} --json assets --jq '.assets[].name' --repo ${{ github.repository }} \ + | grep '${{ matrix.target }}.dmg' \ + | xargs -r -I{} gh release delete-asset ${{ inputs.release_tag }} {} --yes --repo ${{ github.repository }} - name: Publish - uses: softprops/action-gh-release@v1 - with: - prerelease: false - tag_name: ${{ inputs.release_tag }} - files: "${{ env.RELEASE_NAME }}.dmg" env: - GITHUB_TOKEN: ${{ secrets.gh_token }} + GH_TOKEN: ${{ secrets.gh_token }} + run: gh release upload ${{ inputs.release_tag }} "${{ env.RELEASE_NAME }}.dmg" --repo ${{ github.repository }} build_and_upload_linux: name: Build & Upload Linux @@ -183,7 +179,7 @@ jobs: - name: Build shell: bash env: - GH_TOKEN: ${{ github.token }} + GH_TOKEN: ${{ secrets.gh_token }} run: | # Define some variables for things we need release_name="ErsatzTV-Legacy-${{ inputs.release_version }}-${{ matrix.target }}" @@ -209,22 +205,18 @@ jobs: rm -r "$release_name" - name: Delete old release assets - uses: mknejp/delete-release-assets@v1 if: ${{ inputs.release_tag == 'develop' }} - with: - token: ${{ secrets.gh_token }} - tag: ${{ inputs.release_tag }} - fail-if-no-assets: false - assets: "*${{ matrix.target }}.tar.gz" + env: + GH_TOKEN: ${{ secrets.gh_token }} + run: | + gh release view ${{ inputs.release_tag }} --json assets --jq '.assets[].name' --repo ${{ github.repository }} \ + | grep '${{ matrix.target }}.tar.gz' \ + | xargs -r -I{} gh release delete-asset ${{ inputs.release_tag }} {} --yes --repo ${{ github.repository }} - name: Publish - uses: softprops/action-gh-release@v1 - with: - prerelease: false - tag_name: ${{ inputs.release_tag }} - files: "${{ env.RELEASE_NAME }}.tar.gz" env: - GITHUB_TOKEN: ${{ secrets.gh_token }} + GH_TOKEN: ${{ secrets.gh_token }} + run: gh release upload ${{ inputs.release_tag }} "${{ env.RELEASE_NAME }}.tar.gz" --repo ${{ github.repository }} build_dotnet_windows: name: Build dotnet for Windows @@ -310,7 +302,7 @@ jobs: - name: Package artifacts shell: bash env: - GH_TOKEN: ${{ github.token }} + GH_TOKEN: ${{ secrets.gh_token }} run: | release_name="ErsatzTV-Legacy-${{ inputs.release_version }}-win-x64" echo "RELEASE_NAME=${release_name}" >> $GITHUB_ENV @@ -337,19 +329,15 @@ jobs: (cd "${release_name}" && 7z a "../${release_name}.zip" .) - name: Delete old release assets - uses: mknejp/delete-release-assets@v1 if: ${{ inputs.release_tag == 'develop' }} - with: - token: ${{ secrets.gh_token }} - tag: ${{ inputs.release_tag }} - fail-if-no-assets: false - assets: "*win-x64.zip" + env: + GH_TOKEN: ${{ secrets.gh_token }} + run: | + gh release view ${{ inputs.release_tag }} --json assets --jq '.assets[].name' --repo ${{ github.repository }} \ + | grep 'win-x64.zip' \ + | xargs -r -I{} gh release delete-asset ${{ inputs.release_tag }} {} --yes --repo ${{ github.repository }} - name: Publish - uses: softprops/action-gh-release@v1 - with: - prerelease: false - tag_name: ${{ inputs.release_tag }} - files: "${{ env.RELEASE_NAME }}.zip" env: - GITHUB_TOKEN: ${{ secrets.gh_token }} + GH_TOKEN: ${{ secrets.gh_token }} + run: gh release upload ${{ inputs.release_tag }} "${{ env.RELEASE_NAME }}.zip" --repo ${{ github.repository }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f79e9acbb..8c0d75dec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,7 +45,7 @@ jobs: apple_developer_certificate_password: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }} ac_username: ${{ secrets.AC_USERNAME }} ac_password: ${{ secrets.AC_PASSWORD }} - gh_token: ${{ github.token }} + gh_token: ${{ secrets.GITHUB_TOKEN }} azure_client_id: ${{ secrets.AZURE_CLIENT_ID }} azure_tenant_id: ${{ secrets.AZURE_TENANT_ID }} azure_subscription_id: ${{ secrets.AZURE_SUBSCRIPTION_ID }} diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index e8e7328a8..4ca7bbd43 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -51,7 +51,7 @@ jobs: - name: Download next artifacts shell: bash env: - GH_TOKEN: ${{ github.token }} + GH_TOKEN: ${{ secrets.gh_token }} run: | case "${{ matrix.name }}" in amd64) TARGET="linux-x64" ;; diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 34daaa80c..e449613c0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,7 +40,7 @@ jobs: apple_developer_certificate_password: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }} ac_username: ${{ secrets.AC_USERNAME }} ac_password: ${{ secrets.AC_PASSWORD }} - gh_token: ${{ github.token }} + gh_token: ${{ secrets.GITHUB_TOKEN }} azure_client_id: ${{ secrets.AZURE_CLIENT_ID }} azure_tenant_id: ${{ secrets.AZURE_TENANT_ID }} azure_subscription_id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}