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
5 changes: 4 additions & 1 deletion .github/workflows/build_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ jobs:
elif [[ "$RELEASE_VERSION" == *-beta.* ]];
then
RELEASE_ENVIRONMENT="release-beta"
elif [[ "$RELEASE_VERSION" == *-preview.* ]];
then
RELEASE_ENVIRONMENT="release-preview"
elif [[ "$RELEASE_VERSION" == *-rc.* ]];
then
RELEASE_ENVIRONMENT="release-release-candidate"
Expand All @@ -93,7 +96,7 @@ jobs:
exit 1
fi
echo "release_environment=$RELEASE_ENVIRONMENT" >> $GITHUB_OUTPUT
elif [ ''"${GIT_REF}"'' == 'refs/heads/canary' ]
elif [ ''"${GIT_REF}"'' == 'refs/heads/next-16-3-preview' ]
then
echo "value=staging" >> $GITHUB_OUTPUT
elif [ '${{ github.event_name }}' == 'workflow_dispatch' ]
Expand Down
14 changes: 5 additions & 9 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: build-and-test

on:
push:
branches: ['canary']
branches: ['next-16-3-preview']
pull_request:
types: [opened, synchronize]

Expand Down Expand Up @@ -659,7 +659,7 @@ jobs:
name: Test new and changed tests for flakes (dev)
needs: ['optimize-ci', 'changes', 'build-native', 'build-next']
# test-new-tests-if
if: ${{ needs.optimize-ci.outputs.skip == 'false' && needs.changes.outputs.docs-only == 'false' }}
if: false
# test-new-tests-end-if

strategy:
Expand All @@ -685,7 +685,7 @@ jobs:
name: Test new and changed tests for flakes (prod)
needs: ['optimize-ci', 'changes', 'build-native', 'build-next']
# test-new-tests-if
if: ${{ needs.optimize-ci.outputs.skip == 'false' && needs.changes.outputs.docs-only == 'false' }}
if: false
# test-new-tests-end-if

strategy:
Expand All @@ -711,7 +711,7 @@ jobs:
needs:
['optimize-ci', 'test-prod', 'test-new-tests-dev', 'test-new-tests-start']
# test-new-tests-if
if: ${{ needs.optimize-ci.outputs.skip == 'false' }}
if: false
# test-new-tests-end-if

strategy:
Expand Down Expand Up @@ -744,7 +744,7 @@ jobs:
'test-new-tests-start',
]
# test-new-tests-if
if: ${{ needs.optimize-ci.outputs.skip == 'false' }}
if: false
# test-new-tests-end-if

strategy:
Expand Down Expand Up @@ -1042,10 +1042,6 @@ jobs:
'rustdoc-check',
'test-next-swc-wasm',
'test-turbopack-dev',
'test-new-tests-dev',
'test-new-tests-start',
'test-new-tests-deploy',
'test-new-tests-deploy-cache-components',
'test-turbopack-production',
'test-unit-windows',
'test-dev-windows',
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/trigger_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@ on:
workflow_dispatch:
inputs:
releaseType:
description: stable, canary, beta, or release candidate?
description: stable, canary, beta, preview, or release candidate?
required: true
type: choice
options:
- canary
- stable
- release-candidate
- beta
- preview

semverType:
description: semver type?
Expand Down
3 changes: 2 additions & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"publish": {
"npmClient": "npm",
"allowBranch": [
"canary"
"canary",
"next-16-3-preview"
],
"registry": "https://registry.npmjs.org/"
}
Expand Down
14 changes: 10 additions & 4 deletions scripts/start-release.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,17 @@ async function main() {
const isCanary = releaseType === 'canary'
const isReleaseCandidate = releaseType === 'release-candidate'
const isBeta = releaseType === 'beta'
const isPreview = releaseType === 'preview'

if (
releaseType !== 'stable' &&
releaseType !== 'canary' &&
releaseType !== 'release-candidate' &&
releaseType !== 'beta'
releaseType !== 'beta' &&
releaseType !== 'preview'
) {
console.log(
`Invalid release type ${releaseType}, must be stable, canary, release-candidate, or beta`
`Invalid release type ${releaseType}, must be stable, canary, release-candidate, beta, or preview`
)
return
}
Expand Down Expand Up @@ -74,7 +76,9 @@ async function main() {
const lernaArgs = [
'lerna',
'version',
isCanary || isReleaseCandidate || isBeta ? preleaseType : semverType,
isCanary || isReleaseCandidate || isBeta || isPreview
? preleaseType
: semverType,
]

if (isCanary) {
Expand All @@ -83,6 +87,8 @@ async function main() {
lernaArgs.push('--preid', 'rc')
} else if (isBeta) {
lernaArgs.push('--preid', 'beta')
} else if (isPreview) {
lernaArgs.push('--preid', 'preview')
}

lernaArgs.push('--force-publish', '-y', '--no-push')
Expand All @@ -95,7 +101,7 @@ async function main() {

await createGitHubReleaseCommit(githubToken)

if (isCanary || isReleaseCandidate || isBeta) {
if (isCanary || isReleaseCandidate || isBeta || isPreview) {
const releaseChild = execa(
'pnpm',
['release', '--pre', '--skip-questions', '--show-url'],
Expand Down
Loading