Skip to content

Commit

Permalink
Merge branch 'master' into alpha
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] committed Feb 17, 2023
2 parents 71f3e1e + 698fa04 commit 29c5c78
Show file tree
Hide file tree
Showing 3 changed files with 616 additions and 425 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/analyze-dependents.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
39 changes: 39 additions & 0 deletions .github/workflows/sync-alpha-master.yml
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
Loading

0 comments on commit 29c5c78

Please sign in to comment.