From a8da4bca740d2ea6e5092b7abb5a552f1a0478d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Dec 2022 11:33:58 -0500 Subject: [PATCH 1/4] Bump actions/stale from 6 to 7 (#149) Bumps [actions/stale](https://github.com/actions/stale) from 6 to 7. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/v6...v7) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/issues-stale.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/issues-stale.yml b/.github/workflows/issues-stale.yml index 586545e8..460eb848 100644 --- a/.github/workflows/issues-stale.yml +++ b/.github/workflows/issues-stale.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Stale - uses: actions/stale@v6 + uses: actions/stale@v7 with: close-issue-message: > This issue was closed because it has been stalled for 10 days with no activity. @@ -38,7 +38,7 @@ jobs: repo-token: ${{ secrets.GH_BOT_TOKEN }} - name: Invalid Template - uses: actions/stale@v6 + uses: actions/stale@v7 with: close-issue-message: > This issue was closed because the the template was not completed after 5 days. From 14a877bce9069d6123f51056de112ba3abe49e27 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Thu, 22 Dec 2022 18:40:24 -0500 Subject: [PATCH 2/4] do not automerge PRs labeled `dependencies` --- .github/workflows/automerge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index c91ac7d4..0ba55681 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -51,7 +51,7 @@ jobs: BASE_BRANCHES: nightly GITHUB_TOKEN: ${{ secrets.GH_BOT_TOKEN }} GITHUB_LOGIN: ${{ secrets.GH_BOT_NAME }} - MERGE_LABELS: "" + MERGE_LABELS: "!dependencies" MERGE_METHOD: "squash" MERGE_COMMIT_MESSAGE: "{pullRequest.title} (#{pullRequest.number})" MERGE_DELETE_BRANCH: true From ed052691d3df86716b1c7600d82e77b72e6a96f3 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Thu, 22 Dec 2022 18:41:42 -0500 Subject: [PATCH 3/4] do not auto rebase PRs labeled `central_dependency` --- .github/workflows/autoupdate.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/autoupdate.yml b/.github/workflows/autoupdate.yml index 4522182f..83afbc3a 100644 --- a/.github/workflows/autoupdate.yml +++ b/.github/workflows/autoupdate.yml @@ -36,11 +36,17 @@ jobs: dependabot-rebase: name: Dependabot Rebase if: >- - startsWith(github.repository, 'LizardByte/') && - contains(github.event.pull_request.labels.*.name, 'central_dependency') == false + startsWith(github.repository, 'LizardByte/') runs-on: ubuntu-latest steps: + - name: check labels + id: label + run: | + echo "central_dep=${{ contains(github.event.pull_request.labels.*.name, 'central_dependency') }}" \ + >> $GITHUB_OUTPUT + - name: rebase + if: ${{ steps.label.outputs.central_dep == false }} uses: "bbeesley/gha-auto-dependabot-rebase@v1.2.0" env: GITHUB_TOKEN: ${{ secrets.GH_BOT_TOKEN }} From f6d56807f90d42bbf07cb7a8e04a361ab6e3ea77 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Thu, 22 Dec 2022 21:55:24 -0500 Subject: [PATCH 4/4] fix autoupdate label events (#154) Cannot use `pull_request_review` as it doesn't have access to secrets when a review is made by an outside member. --- .github/workflows/autoupdate-labeler.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/autoupdate-labeler.yml b/.github/workflows/autoupdate-labeler.yml index 92b00988..5e426ad7 100644 --- a/.github/workflows/autoupdate-labeler.yml +++ b/.github/workflows/autoupdate-labeler.yml @@ -10,11 +10,8 @@ on: types: - edited - opened + - reopened - synchronize - pull_request_review: - types: - - edited - - submitted jobs: label_pr: @@ -40,11 +37,7 @@ jobs: steps.org_member.outputs.result == 'true' && contains(github.event.pull_request.labels.*.name, 'autoupdate') == false && contains(github.event.pull_request.body, - fromJSON('"\n- [x] I want maintainers to keep my branch updated"')) == true && - ( - (github.event_name == 'pull_request_review' && github.event.review.state == 'approved') || - (github.event_name == 'pull_request') - ) + fromJSON('"\n- [x] I want maintainers to keep my branch updated"')) == true uses: actions/github-script@v6 with: @@ -60,7 +53,6 @@ jobs: - name: Unlabel autoupdate if: >- contains(github.event.pull_request.labels.*.name, 'autoupdate') && - github.event_name == 'pull_request' && ( (github.event.action == 'synchronize' && steps.org_member.outputs.result == 'false') || (contains(github.event.pull_request.body,