diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 2be9018..434bbd8 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -12,17 +12,14 @@ on: default: false type: boolean -env: - GIT_TAG: ${{ github.event.inputs.tag }} - DRY_RUN: ${{ github.event.inputs.dry-run }} - jobs: update-packagejson: uses: Cysharp/Actions/.github/workflows/update-packagejson.yaml@main with: file-path: ./src/MasterMemory.Unity/Assets/Scripts/MasterMemory/package.json - tag: ${{ github.event.inputs.tag }} - dry-run: ${{ fromJson(github.event.inputs.dry-run) }} + tag: ${{ inputs.tag }} + dry-run: ${{ inputs.dry-run }} + push-tag: false build-dotnet: needs: [update-packagejson] @@ -38,9 +35,9 @@ jobs: 5.0.x 6.0.x # pack nuget - - run: dotnet build -c Release -p:Version=${{ env.GIT_TAG }} - - run: dotnet test -c Release --no-build -p:Version=${{ env.GIT_TAG }} - - run: dotnet pack -c Release --no-build -p:Version=${{ env.GIT_TAG }} -o ./publish + - run: dotnet build -c Release -p:Version=${{ inputs.tag }} + - run: dotnet test -c Release --no-build -p:Version=${{ inputs.tag }} + - run: dotnet pack -c Release --no-build -p:Version=${{ inputs.tag }} -o ./publish - uses: actions/upload-artifact@v2 with: name: nuget @@ -66,7 +63,7 @@ jobs: UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }} - UNITY_PACKAGE_VERSION: ${{ env.GIT_TAG }} + UNITY_PACKAGE_VERSION: ${{ inputs.tag }} with: projectPath: src/MasterMemory.Unity unityVersion: ${{ matrix.unity }} @@ -80,43 +77,24 @@ jobs: # Store artifacts. - uses: actions/upload-artifact@v2 with: - name: MasterMemory.Unity.${{ env.GIT_TAG }}.unitypackage - path: ./src/MasterMemory.Unity/MasterMemory.Unity.${{ env.GIT_TAG }}.unitypackage + name: MasterMemory.Unity.${{ inputs.tag }}.unitypackage + path: ./src/MasterMemory.Unity/MasterMemory.Unity.${{ inputs.tag }}.unitypackage + # release create-release: - if: github.event.inputs.dry-run == 'false' needs: [update-packagejson, build-dotnet, build-unity] - runs-on: ubuntu-latest - steps: - # setup dotnet for nuget push - - uses: Cysharp/Actions/.github/actions/setup-dotnet@main - # Create Release - - uses: actions/create-release@v1 - id: create_release - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{ env.GIT_TAG }} - release_name: Ver.${{ env.GIT_TAG }} - commitish: ${{ needs.update-packagejson.outputs.sha }} - draft: true - prerelease: false - # Download (All) Artifacts to current directory - - uses: actions/download-artifact@v2 - # Upload to NuGet - - run: dotnet nuget push "./nuget/*.nupkg" --skip-duplicate -s https://www.nuget.org/api/v2/package -k ${{ secrets.NUGET_KEY }} - # Upload to Releases(unitypackage) - - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./MasterMemory.Unity.${{ env.GIT_TAG }}.unitypackage/MasterMemory.Unity.${{ env.GIT_TAG }}.unitypackage - asset_name: MasterMemory.Unity.${{ env.GIT_TAG }}.unitypackage - asset_content_type: application/octet-stream + 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: true + release-upload: true + release-asset-path: ./MasterMemory.Unity.${{ inputs.tag }}.unitypackage/MasterMemory.Unity.${{ inputs.tag }}.unitypackage + secrets: inherit cleanup: - if: needs.update-packagejson.outputs.is-branch-created == 'true' + if: ${{ needs.update-packagejson.outputs.is-branch-created == 'true' }} needs: [update-packagejson, build-unity] uses: Cysharp/Actions/.github/workflows/clean-packagejson-branch.yaml@main with: