From 361911cac173ada9468a2f9184932fa49da9ef13 Mon Sep 17 00:00:00 2001 From: Christian Kotzbauer Date: Fri, 18 Sep 2020 17:01:21 +0200 Subject: [PATCH] improve github-actions Signed-off-by: Christian Kotzbauer --- .github/label-commands.json | 2 -- .github/workflows/automerge.yml | 2 +- .github/workflows/size-label.yml | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/label-commands.json b/.github/label-commands.json index 04eba5c..e7cda1b 100644 --- a/.github/label-commands.json +++ b/.github/label-commands.json @@ -1,7 +1,5 @@ { "commands": [ - { "command": "approved", "arg": "", "action": "add-label", "label": "approved", "dispatch": "approved" }, - { "command": "approved", "arg": "cancel", "action": "remove-label", "label": "approved" }, { "command": "hold", "arg": "", "action": "add-label", "label": "hold" }, { "command": "hold", "arg": "cancel", "action": "remove-label", "label": "hold" }, { "command": "label", "arg": "(.*)", "action": "add-label", "label": "$1" }, diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index f3733d6..03702c1 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -25,6 +25,6 @@ jobs: uses: "pascalgn/automerge-action@4775c532c615e0491d53bc42c0893840ae7cc07a" env: GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - MERGE_LABELS: "approved,!work-in-progress" + MERGE_LABELS: "approved,!work-in-progress,!hold" MERGE_METHOD: "rebase" MERGE_DELETE_BRANCH: "true" diff --git a/.github/workflows/size-label.yml b/.github/workflows/size-label.yml index 2652437..b51477b 100644 --- a/.github/workflows/size-label.yml +++ b/.github/workflows/size-label.yml @@ -8,3 +8,4 @@ jobs: uses: "pascalgn/size-label-action@3de5b9af54686db1856cf445e22715dc92f259de" env: GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + IGNORED: ".*\npackage-lock.json\ndist/**"