-
Notifications
You must be signed in to change notification settings - Fork 67
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
3 changed files
with
616 additions
and
425 deletions.
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -280,9 +280,9 @@ jobs: | |
uses: hmarr/auto-approve-action@v2 | ||
with: | ||
pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} | ||
github-token: ${{ secrets.EDX_NETLIFY_PAT }} | ||
github-token: ${{ secrets.requirements_bot_github_token }} | ||
- name: Auto-merge pull request for dependent project usages | ||
uses: pascalgn/[email protected] | ||
env: | ||
GITHUB_TOKEN: ${{ secrets.EDX_NETLIFY_PAT }} | ||
GITHUB_TOKEN: ${{ secrets.requirements_bot_github_token }} | ||
MERGE_METHOD: squash |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
name: Sync alpha with master | ||
on: | ||
push: | ||
branches: | ||
- master | ||
|
||
jobs: | ||
sync-branches: | ||
runs-on: ubuntu-latest | ||
name: Syncing branches | ||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v2 | ||
with: | ||
fetch-depth: 0 | ||
- name: Setup Git User | ||
uses: fregante/setup-git-user@v1 | ||
- name: Setup Node | ||
uses: actions/setup-node@v1 | ||
with: | ||
node-version: 18 | ||
- name: Sync changes | ||
run: | | ||
git switch alpha | ||
git merge master | ||
- name: Create Pull Request | ||
id: cpr | ||
uses: peter-evans/create-pull-request@v4 | ||
with: | ||
token: ${{ secrets.requirements_bot_github_token }} | ||
branch: automation/sync-alpha-master | ||
title: "chore(release): sync from master to alpha" | ||
body: "Sync changes from `master` to `alpha`." | ||
- name: Enable Pull Request Auto Merge | ||
uses: peter-evans/enable-pull-request-automerge@v2 | ||
with: | ||
token: ${{ secrets.requirements_bot_github_token }} | ||
pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} | ||
merge-method: squash |
Oops, something went wrong.