diff options
| author | nea <romangraef@gmail.com> | 2022-11-01 21:24:25 +0100 |
|---|---|---|
| committer | nea <romangraef@gmail.com> | 2022-11-01 21:24:25 +0100 |
| commit | 05d2ae11997b85918890e853634efd7df2986aef (patch) | |
| tree | 29afe632ddd32fe1887d4267914ac00c5f51464f /.github | |
| parent | 170ebea5a6e46c0f489e80460d5e169f6ebdd1dd (diff) | |
| parent | e42dd2aa0a2e0a988e820e1ceb13cf2bc30ba987 (diff) | |
| download | NotEnoughUpdates-05d2ae11997b85918890e853634efd7df2986aef.tar.gz NotEnoughUpdates-05d2ae11997b85918890e853634efd7df2986aef.tar.bz2 NotEnoughUpdates-05d2ae11997b85918890e853634efd7df2986aef.zip | |
Merge remote-tracking branch 'origin/master' into feature/glowshrooms
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/infer.yml | 5 | ||||
| -rw-r--r-- | .github/workflows/remove-merge-needed-label.yml | 32 | ||||
| -rwxr-xr-x | .github/workflows/send_webhook_update.sh | 2 |
3 files changed, 36 insertions, 3 deletions
diff --git a/.github/workflows/infer.yml b/.github/workflows/infer.yml index 7a035a42..049b9d3b 100644 --- a/.github/workflows/infer.yml +++ b/.github/workflows/infer.yml @@ -1,12 +1,13 @@ name: Infer on: - - pull_request + - pull_request_target - workflow_dispatch +permissions: {} jobs: inferering: runs-on: ubuntu-latest - + if: "!contains(github.event.head_commit.message, '[no infer]')" steps: - uses: actions/checkout@v3 name: Checkout feature diff --git a/.github/workflows/remove-merge-needed-label.yml b/.github/workflows/remove-merge-needed-label.yml new file mode 100644 index 00000000..0ff57523 --- /dev/null +++ b/.github/workflows/remove-merge-needed-label.yml @@ -0,0 +1,32 @@ +name: Remove merge label + +on: + - pull_request_target + + +permissions: + contents: read + pull-requests: write + +jobs: + check-mergability: + env: + GH_TOKEN: + ${{ secrets.GITHUB_TOKEN }} + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + - run: | + echo This is the merginator 2000 speaking, i am now checking your mergability + if git merge-tree "$(git merge-base ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }})" ${{ github.event.pull_request.head.sha }} "${{ github.event.pull_request.base.sha }}" | grep "^<<<<<<<\|changed in both" >/dev/null; then + echo "This PR is deemed: dirty :(" + echo "{\"labels\":[\"$MERGE_LABEL\"]}"|gh api -X POST --input - "$ISSUE_PATH" || true + else + echo This PR is deemed: clean! + gh api -X DELETE $ISSUE_PATH/$MERGE_LABEL || true + fi + env: + MERGE_LABEL: needs-merge + ISSUE_PATH: /repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/labels diff --git a/.github/workflows/send_webhook_update.sh b/.github/workflows/send_webhook_update.sh index f0eb0051..7a6f932d 100755 --- a/.github/workflows/send_webhook_update.sh +++ b/.github/workflows/send_webhook_update.sh @@ -104,4 +104,4 @@ fi echo "Message sent to discord." echo "$discord_output" | jq . id_string=$(echo "$discord_output" | jq .id) -echo "::set-output name=MESSAGE_ID::${id_string//\"/}" +echo "MESSAGE_ID=${id_string//\"/}" >> $GITHUB_OUTPUT |