Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: CI

on:
push:
branches: [next]
branches: [main, next]
pull_request:
types: [opened, synchronize, reopened]
branches: [next]
branches: [main, next]
merge_group:
workflow_dispatch:

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@ name: E2E Test
on:
push:
branches:
- main
- next
paths-ignore:
- '**/*.md'
pull_request:
branches:
- main
- next
paths-ignore:
- '**/*.md'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
branch:
description: 'Branch to release from (must be a protected release branch)'
required: true
default: 'next'
default: 'main'
type: choice
options:
- next
Expand Down
3 changes: 3 additions & 0 deletions scripts/test/release.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ const workflow = yaml.load(fs.readFileSync(path.join(root, '.github/workflows/re
test('release guard requires an allowed branch and its full branch ref', () => {
const guard = workflow.jobs.release.steps[0];
assert.equal(guard.env.DISPATCH_REF, '${{ github.ref }}');
const defaultBranch = workflow.on.workflow_dispatch.inputs.branch.default;
assert.equal(defaultBranch, 'main');
for (const [branch, ref, succeeds] of [
[defaultBranch, `refs/heads/${defaultBranch}`, true],
['next', 'refs/heads/next', true],
['main', 'refs/heads/main', true],
['master', 'refs/heads/master', false],
Expand Down
Loading