Skip to content
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

Sync alpha with master #2072

Merged
merged 25 commits into from
Feb 22, 2023
+611 −465
Merged

Sync alpha with master #2072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
f58eb9e
docs: update dependent-usage.json (#2028)
github-actions[bot] Feb 16, 2023
3138169
build: add GH workflow to sync alpha with master automatically (#2030)
adamstankiewicz Feb 17, 2023
e388665
docs: update dependent-usage.json (#2032)
github-actions[bot] Feb 17, 2023
93440f9
build: update sync workflow for alpha (#2033)
adamstankiewicz Feb 17, 2023
4c78515
build: include fetch-depth: 0 to checkout (#2034)
adamstankiewicz Feb 17, 2023
edbc46e
build: setup git user in sync branches workflow (#2035)
adamstankiewicz Feb 17, 2023
698fa04
build: add a branch for generated workflow PR (#2037)
adamstankiewicz Feb 17, 2023
d99b107
build: skip CI for automation sync PR (#2039)
adamstankiewicz Feb 17, 2023
3dfa469
chore: update browserslist DB (#1977)
edx-requirements-bot Feb 17, 2023
601b4ef
build: rebase instead of merge for syncing changes (#2042)
adamstankiewicz Feb 17, 2023
5a2644b
build: another attempt to auto-sync changes from master to alpha (#2044)
adamstankiewicz Feb 17, 2023
d6a761d
build: 1 to v1 in sync-branches workflow (#2045)
adamstankiewicz Feb 17, 2023
ab68dc4
build: switch base to trying a rebase (#2047)
adamstankiewicz Feb 17, 2023
5543854
build: pull from alpha before rebase master (#2049)
adamstankiewicz Feb 17, 2023
8f0e613
build: git checkout instead of git switch (#2051)
adamstankiewicz Feb 17, 2023
d45142e
build: set base branch to alpha (#2053)
adamstankiewicz Feb 17, 2023
9b053dc
build: try using devmasx/merge-branch (#2055)
adamstankiewicz Feb 17, 2023
14119d4
build: update merge-branch version number (#2056)
adamstankiewicz Feb 17, 2023
b6bffff
build: try action-sync-branch (#2057)
adamstankiewicz Feb 17, 2023
d8e09a1
build: remove sync alpha master workflow temporarily (#2059)
adamstankiewicz Feb 18, 2023
4cd12c1
docs: update dependent-usage.json (#2060)
github-actions[bot] Feb 18, 2023
d2fa3d5
docs: update dependent-usage.json (#2061)
github-actions[bot] Feb 19, 2023
915754d
docs: update dependent-usage.json (#2063)
github-actions[bot] Feb 20, 2023
6642002
docs: update dependent-usage.json (#2065)
github-actions[bot] Feb 21, 2023
848183e
docs: update dependent-usage.json (#2073)
github-actions[bot] Feb 22, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/analyze-dependents.yml
View file
Open in desktop
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
3 changes: 1 addition & 2 deletions .github/workflows/commitlint.yml
View file
Open in desktop
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