-
Notifications
You must be signed in to change notification settings - Fork 513
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into a11ysidebar
- Loading branch information
Showing
92 changed files
with
2,014 additions
and
1,706 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
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 |
|---|---|---|
|
|
@@ -13,6 +13,7 @@ env: | |
| DEFAULT_DEPLOYMENT_PREFIX: "main" | ||
| DEFAULT_NOTES: "" | ||
| DEFAULT_LOG_EACH_SUCCESSFUL_UPLOAD: "false" | ||
| DEFAULT_REF: next | ||
|
|
||
| on: | ||
| schedule: | ||
|
|
@@ -21,6 +22,10 @@ on: | |
|
|
||
| workflow_dispatch: | ||
| inputs: | ||
| ref: | ||
| description: "Branch to deploy (default: next)" | ||
| required: false | ||
|
|
||
| notes: | ||
| description: "Notes" | ||
| required: false | ||
|
|
@@ -68,7 +73,35 @@ jobs: | |
| if: github.repository == 'mdn/yari' | ||
|
|
||
| steps: | ||
| # Our usecase is a bit complicated. When the cron schedule runs this workflow, | ||
| # we rely on the env vars defined at the top of the file. But if it's a manual | ||
| # trigger we rely on the inputs and only the inputs. That way, the user can | ||
| # opt to type in 'false'. | ||
| # It's not possible to express this with GitHub Workflow syntax, so we | ||
| # have a dedicate set that conveniently sets these as env vars which we | ||
| # can refer to later in `if: ....` lines or in bash with the `run: ...` blocks. | ||
| - name: Merge dispatch inputs with default env vars | ||
| run: | | ||
| echo "DEPLOYER_BUCKET_PREFIX=${{ github.event.inputs.deployment_prefix || env.DEFAULT_DEPLOYMENT_PREFIX }}" >> $GITHUB_ENV | ||
| echo "DEPLOYER_LOG_EACH_SUCCESSFUL_UPLOAD=${{ github.event.inputs.log_each_successful_upload || env.DEFAULT_LOG_EACH_SUCCESSFUL_UPLOAD }}" >> $GITHUB_ENV | ||
| echo "REF=${{ github.event.inputs.ref || env.DEFAULT_REF }}" >> $GITHUB_ENV | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| ref: ${{ env.REF }} | ||
| fetch-depth: 0 | ||
|
|
||
| - name: Merge main | ||
| if: ${{ env.REF != 'main' }} | ||
| run: | | ||
| git config --global user.email "[email protected]" | ||
| git config --global user.name "mdn-bot" | ||
| git status | ||
| git pull | ||
| git checkout main | ||
| git status | ||
| git checkout - | ||
| git merge main --no-edit | ||
| - uses: actions/checkout@v4 | ||
| if: ${{ ! vars.SKIP_BUILD || ! vars.SKIP_FUNCTION }} | ||
|
|
@@ -95,18 +128,6 @@ jobs: | |
| repository: mdn/curriculum | ||
| path: mdn/curriculum | ||
|
|
||
| # Our usecase is a bit complicated. When the cron schedule runs this workflow, | ||
| # we rely on the env vars defined at the top of the file. But if it's a manual | ||
| # trigger we rely on the inputs and only the inputs. That way, the user can | ||
| # opt to type in 'false'. | ||
| # It's not possible to express this with GitHub Workflow syntax, so we | ||
| # have a dedicate set that conveniently sets these as env vars which we | ||
| # can refer to later in `if: ....` lines or in bash with the `run: ...` blocks. | ||
| - name: Merge dispatch inputs with default env vars | ||
| run: | | ||
| echo "DEPLOYER_BUCKET_PREFIX=${{ github.event.inputs.deployment_prefix || env.DEFAULT_DEPLOYMENT_PREFIX }}" >> $GITHUB_ENV | ||
| echo "DEPLOYER_LOG_EACH_SUCCESSFUL_UPLOAD=${{ github.event.inputs.log_each_successful_upload || env.DEFAULT_LOG_EACH_SUCCESSFUL_UPLOAD }}" >> $GITHUB_ENV | ||
| - uses: actions/checkout@v4 | ||
| if: ${{ ! vars.SKIP_BUILD || ! vars.SKIP_FUNCTION }} | ||
| with: | ||
|
|
||
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
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
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 |
|---|---|---|
| @@ -1 +1 @@ | ||
| v18.18 | ||
| v18 |
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 |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| ".": "2.45.0" | ||
| ".": "2.47.0" | ||
| } |
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
Oops, something went wrong.