From 3257a1d3c87e940ed4373a326fb7fb6eeb37957d Mon Sep 17 00:00:00 2001 From: Ikiru Yoshizaki <3856350+guitarrapc@users.noreply.github.com> Date: Tue, 6 Oct 2026 17:15:50 +0900 Subject: [PATCH] ci: Improve consistency for nuget publish --- .github/workflows/build-release.yaml | 76 ++++++++++++++-------------- 1 file changed, 39 insertions(+), 37 deletions(-) diff --git a/.github/workflows/build-release.yaml b/.github/workflows/build-release.yaml index 74b6995..deb711e 100644 --- a/.github/workflows/build-release.yaml +++ b/.github/workflows/build-release.yaml @@ -12,19 +12,31 @@ on: default: false type: boolean +concurrency: + group: release + cancel-in-progress: false + jobs: + validate-release: + permissions: + contents: read + uses: Cysharp/Actions/.github/workflows/validate-release.yaml@main + with: + tag: ${{ inputs.tag }} + update-packagejson: + needs: [validate-release] permissions: actions: read contents: write uses: Cysharp/Actions/.github/workflows/update-packagejson.yaml@main with: file-path: ./src/UniTask/Assets/Plugins/UniTask/package.json - tag: ${{ inputs.tag }} + tag: ${{ needs.validate-release.outputs.tag }} dry-run: ${{ inputs.dry-run }} build-dotnet: - needs: [update-packagejson] + needs: [validate-release, update-packagejson] permissions: contents: read runs-on: ubuntu-24.04 @@ -36,9 +48,9 @@ jobs: ref: ${{ needs.update-packagejson.outputs.sha }} - uses: Cysharp/Actions/.github/actions/setup-dotnet@main # build and pack nuget (.nupkg and .symbols.nupkg will be created) - - run: dotnet build -c Release -p:Version=${{ inputs.tag }} + - run: dotnet build -c Release -p:Version=${{ needs.validate-release.outputs.tag }} - run: dotnet test -c Release --no-build - - run: dotnet pack ./src/UniTask.NetCore/UniTask.NetCore.csproj -c Release --no-build -p:Version=${{ inputs.tag }} -p:IncludeSymbols=true -o ./publish + - run: dotnet pack ./src/UniTask.NetCore/UniTask.NetCore.csproj -c Release --no-build -p:Version=${{ needs.validate-release.outputs.tag }} -p:IncludeSymbols=true -o ./publish # Store artifacts. - uses: Cysharp/Actions/.github/actions/upload-artifact@main with: @@ -47,7 +59,7 @@ jobs: retention-days: 1 build-unity: - needs: [update-packagejson] + needs: [validate-release, update-packagejson] strategy: matrix: unity: ["2022.3.39f1"] @@ -92,52 +104,42 @@ jobs: # Store artifacts. - uses: Cysharp/Actions/.github/actions/upload-artifact@main with: - name: UniTask.${{ inputs.tag }}.unitypackage - path: ./src/UniTask/UniTask.${{ inputs.tag }}.unitypackage + name: UniTask.${{ needs.validate-release.outputs.tag }}.unitypackage + path: ./src/UniTask/UniTask.${{ needs.validate-release.outputs.tag }}.unitypackage retention-days: 1 - # publish - publish: - name: "Publish NuGet packages" - needs: [build-dotnet, build-unity] - permissions: - contents: read - id-token: write # required for NuGet Trusted Publish - runs-on: ubuntu-24.04 - timeout-minutes: 10 - steps: - - uses: Cysharp/Actions/.github/actions/setup-dotnet@main - - uses: Cysharp/Actions/.github/actions/download-artifact@main - # push nuget - - name: NuGet login (OIDC) - uses: NuGet/login@8d196754b4036150537f80ac539e15c2f1028841 # v1.2.0 - id: login - with: - user: ${{ secrets.NUGET_USER }} - - run: dotnet nuget push "./nuget/*.nupkg" --skip-duplicate -s https://api.nuget.org/v3/index.json -k "${NUGET_KEY}" - if: ${{ !inputs.dry-run }} - env: - NUGET_KEY: ${{ steps.login.outputs.NUGET_API_KEY }} - # release create-release: - needs: [update-packagejson, publish] + needs: [validate-release, update-packagejson, build-dotnet, build-unity] permissions: contents: write - id-token: write # required for NuGet Trusted Publish uses: Cysharp/Actions/.github/workflows/create-release.yaml@main with: commit-id: ${{ needs.update-packagejson.outputs.sha }} dry-run: ${{ inputs.dry-run }} - tag: ${{ inputs.tag }} - nuget-push: false + tag: ${{ needs.validate-release.outputs.tag }} release-upload: true - release-asset-path: ./UniTask.${{ inputs.tag }}.unitypackage/UniTask.${{ inputs.tag }}.unitypackage + release-asset-path: ./UniTask.${{ needs.validate-release.outputs.tag }}.unitypackage/UniTask.${{ needs.validate-release.outputs.tag }}.unitypackage secrets: inherit + publish-package: + needs: [validate-release, create-release] + if: ${{ !inputs.dry-run }} + permissions: + contents: read + id-token: write # required for NuGet Trusted Publish in the calling repository + runs-on: ubuntu-24.04 + timeout-minutes: 10 + steps: + - uses: Cysharp/Actions/.github/actions/publish-nuget@main + with: + artifact-name: nuget + user: ${{ secrets.NUGET_USER }} + version: ${{ needs.validate-release.outputs.version }} + cleanup: - if: ${{ needs.update-packagejson.outputs.is-branch-created == 'true' }} - needs: [update-packagejson, create-release] + if: ${{ always() && needs.update-packagejson.outputs.is-branch-created == 'true' }} + needs: [update-packagejson, create-release, publish-package] permissions: contents: write uses: Cysharp/Actions/.github/workflows/clean-packagejson-branch.yaml@main