Skip to content

Commit

Permalink
Merge pull request #2072 from openedx/master
Browse files Browse the repository at this point in the history
Sync `alpha` with `master`
  • Loading branch information
adamstankiewicz authored and PKulkoRaccoonGang committed Aug 1, 2024
2 parents 3f62320 + 848183e commit 9eaf825
Show file tree
Hide file tree
Showing 4 changed files with 611 additions and 465 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
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 9eaf825

Please sign in to comment.