Skip to content

Fix/autoupdate and automerge #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ReenigneArcher merged 2 commits into from
Dec 22, 2022
Merged

Fix/autoupdate and automerge #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14a877b
do not automerge PRs labeled `dependencies`
ReenigneArcher Dec 22, 2022
ed05269
do not auto rebase PRs labeled `central_dependency`
ReenigneArcher Dec 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/automerge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/autoupdate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}