Merge Upstream (upstream) #21941
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| name: Merge Upstream (upstream) | |
| on: | |
| schedule: | |
| - cron: '*/15 * * * *' | |
| workflow_dispatch: | |
| jobs: | |
| merge: | |
| runs-on: ubuntu-latest | |
| outputs: | |
| push_successful: ${{ env.push_successful }} | |
| steps: | |
| - name: Checkout | |
| uses: actions/checkout@main | |
| with: | |
| ref: 'upstream' | |
| token: ${{ secrets.GH_TOKEN_FOR_MERGE }} | |
| - name: Fetch Upstream | |
| run: | | |
| git config --global user.email "[email protected]" | |
| git config --global user.name "Srgr0" | |
| git remote add upstream https://github.com/misskey-dev/misskey.git | |
| git fetch upstream develop | |
| - name: Check for Changes | |
| run: | | |
| CHANGES=$(git diff HEAD...upstream/develop) | |
| if [ -z "$CHANGES" ]; then | |
| echo "No changes to merge." | |
| echo "need_push=false" >> $GITHUB_ENV | |
| echo "push_successful=false" >> $GITHUB_ENV | |
| exit 0 | |
| fi | |
| echo "need_push=true" >> $GITHUB_ENV | |
| - name: Merge & Push Upstream | |
| #ๅคๆดๅ ๅฎนใใใๅ ดๅใฎใฟๅฎ่ก | |
| if: env.need_push == 'true' | |
| run: | | |
| git merge upstream/develop --no-edit | |
| if [ $? -ne 0 ]; then | |
| echo "Merge conflict detected, stopping workflow." | |
| echo "push_successful=false" >> $GITHUB_ENV | |
| exit 1 | |
| fi | |
| git push origin upstream | |
| echo "push_successful=true" >> $GITHUB_ENV | |
| trigger_docker-develop: | |
| runs-on: ubuntu-latest | |
| needs: merge | |
| if: ${{ needs.merge.outputs.push_successful == 'true' }} | |
| steps: | |
| - name: 'Trigger Dispatch Event' | |
| run: | | |
| curl -X POST -H "Authorization: token ${{ secrets.GH_TOKEN_FOR_DISPATCH_dd }}" \ | |
| -H "Accept: application/vnd.github.v3+json" \ | |
| https://api.github.com/repos/srgr0/misskey/actions/workflows/docker-develop.yml/dispatches \ | |
| -d '{"ref": "default", "inputs": {"branch": "upstream"}}' | |
| trigger_deploy-test-environment: | |
| runs-on: ubuntu-latest | |
| needs: merge | |
| if: ${{ needs.merge.outputs.push_successful == 'true' }} | |
| steps: | |
| - name: 'Trigger Dispatch Event' | |
| run: | | |
| curl -X POST -H "Authorization: token ${{ secrets.GH_TOKEN_FOR_DISPATCH_dd }}" \ | |
| -H "Accept: application/vnd.github.v3+json" \ | |
| https://api.github.com/repos/srgr0/misskey/actions/workflows/deploy-test-environment.yml/dispatches \ | |
| -d '{"ref": "default", "inputs": {"repository": "srgr0/misskey", "branch": "upstream"}}' |