Skip to content

Commit

Permalink
chore: sync alpha with master (#2070)
Browse files Browse the repository at this point in the history
* docs: update dependent-usage.json (#2028)

* build: add GH workflow to sync alpha with master automatically (#2030)

* docs: update dependent-usage.json (#2032)

* build: update sync workflow for alpha (#2033)

* build: include fetch-depth: 0 to checkout (#2034)

* build: setup git user in sync branches workflow (#2035)

* build: add a branch for generated workflow PR (#2037)

* build: skip CI for automation sync PR (#2039)

* build: skip CI for automation sync PR

* build: skip commitlint check for automated sync PRs

* chore: update browserslist DB (#1977)

* build: rebase instead of merge for syncing changes (#2042)

* build: another attempt to auto-sync changes from master to alpha (#2044)

* build: 1 to v1 in sync-branches workflow (#2045)

* build: switch base to trying a rebase (#2047)

* build: pull from alpha before rebase master (#2049)

* build: git checkout instead of git switch (#2051)

* build: set base branch to alpha (#2053)

* build: try using devmasx/merge-branch (#2055)

* build: update merge-branch version number (#2056)

* build: try action-sync-branch (#2057)

* build: remove sync alpha master workflow temporarily (#2059)

* docs: update dependent-usage.json (#2060)

* docs: update dependent-usage.json (#2061)

* docs: update dependent-usage.json (#2063)

* docs: update dependent-usage.json (#2065)

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: edX requirements bot <49161187+edx-requirements-bot@users.noreply.github.com>
  • Loading branch information
3 people authored Feb 22, 2023
1 parent 5ea28ea commit 00fbc1d
Show file tree
Hide file tree
Showing 4 changed files with 603 additions and 452 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/automerge-action@v0.14.3
env:
GITHUB_TOKEN: ${{ secrets.EDX_NETLIFY_PAT }}
GITHUB_TOKEN: ${{ secrets.requirements_bot_github_token }}
MERGE_METHOD: squash
3 changes: 1 addition & 2 deletions .github/workflows/commitlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

name: Lint Commit Messages

on:
- pull_request
on: pull_request

jobs:
commitlint:
Expand Down
Loading

0 comments on commit 00fbc1d

Please sign in to comment.