diff --git a/.github/workflows/build-electron.yml b/.github/workflows/build-electron.yml index cd8b529..1d04ba6 100644 --- a/.github/workflows/build-electron.yml +++ b/.github/workflows/build-electron.yml @@ -14,6 +14,10 @@ on: paths: - "um-react" workflow_call: + inputs: + commit: + type: string + default: main permissions: contents: write @@ -116,7 +120,7 @@ jobs: upload-release: name: Upload Release runs-on: ubuntu-latest - if: ${{ inputs.release || github.event_name == 'push' || github.event_name == 'workflow_call' }} + if: ${{ inputs.release || github.event_name == 'push' || github.event_name == 'repository_dispatch' }} needs: [build-linux-windows, build-macos] steps: - name: Download release files @@ -131,5 +135,6 @@ jobs: file: ${{ needs.build-linux-windows.outputs.version }}/* tag: ${{ needs.build-linux-windows.outputs.version }} body: Release ${{ needs.build-linux-windows.outputs.version }} + target_commit: ${{ github.event_name == 'repository_dispatch' && inputs.commit || github.sha }} overwrite: true file_glob: true diff --git a/.github/workflows/update-um-react.yml b/.github/workflows/update-um-react.yml index 0238150..0138de2 100644 --- a/.github/workflows/update-um-react.yml +++ b/.github/workflows/update-um-react.yml @@ -11,6 +11,8 @@ jobs: update-um-react: name: Update um-react runs-on: ubuntu-latest + outputs: + commit: ${{ steps.push.outputs.pushed && steps.push.outputs.commit-sha || github.sha }} steps: - name: Checkout uses: actions/checkout@v4.1.1 @@ -23,6 +25,7 @@ jobs: cd .. - name: Push + id: push uses: actions4git/add-commit-push@v1 continue-on-error: true with: @@ -31,3 +34,5 @@ jobs: call-build: uses: ./.github/workflows/build-electron.yml needs: update-um-react + with: + commit: ${{ needs.update-um-react.outputs.commit }}