Skip to content

Commit

Permalink
enhance(stage-build): always build from next + trigger from main (#10986
Browse files Browse the repository at this point in the history
)

* chore(stage-build): remove misleading ref input

* enhance(stage-build): always trigger on main + build on next
  • Loading branch information
caugner authored Apr 26, 2024
1 parent 1093f7a commit c9fc3de
Showing 1 changed file with 6 additions and 13 deletions.
19 changes: 6 additions & 13 deletions .github/workflows/stage-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ env:
DEFAULT_DEPLOYMENT_PREFIX: "main"
DEFAULT_NOTES: ""
DEFAULT_LOG_EACH_SUCCESSFUL_UPLOAD: "false"
DEFAULT_REF: next

on:
schedule:
Expand All @@ -22,10 +21,6 @@ on:

workflow_dispatch:
inputs:
ref:
description: "Branch to deploy (default: next)"
required: false

notes:
description: "Notes"
required: false
Expand Down Expand Up @@ -67,19 +62,20 @@ permissions:
jobs:
trigger:
runs-on: ubuntu-latest
if: ${{ github.repository == 'mdn/yari' && github.event.schedule != '' }}

# When run from `main` branch (schedule or manual), trigger workflow on `next` branch instead.
if: ${{ github.repository == 'mdn/yari' && github.ref_name == 'main' }}
steps:
# The schedule runs the `main` version, but we want the `next` version.
- run: gh workflow run "${{ github.workflow }}" --repo "${{ github.repository }}" --ref "${{ env.DEFAULT_REF }}"
- run: gh workflow run "${{ github.workflow }}" --repo "${{ github.repository }}" --ref "next"
env:
GH_TOKEN: ${{ secrets.AUTOMERGE_TOKEN }}

build:
environment: stage
runs-on: ubuntu-latest

# Only run the scheduled workflows on the main repo.
if: ${{ github.repository == 'mdn/yari' && github.event.schedule == '' }}
# We only ever want to deploy the `next` branch to stage.
if: ${{ github.repository == 'mdn/yari' && github.ref_name == 'next' }}

steps:
# Our usecase is a bit complicated. When the cron schedule runs this workflow,
Expand All @@ -93,15 +89,12 @@ jobs:
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"
Expand Down

0 comments on commit c9fc3de

Please sign in to comment.