Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

switch default tested branch from svelte-4 to main (svelte5) #17

Merged
merged 2 commits into from
Apr 29, 2024
Merged

switch default tested branch from svelte-4 to main (svelte5) #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
180f7eb
switch default tested branch from svelte-4 to main (svelte5)
dominikg Apr 4, 2024
daa60dc
fix: pick correct output file by svelte major for selftest script
dominikg Apr 4, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/ecosystem-ci-from-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
description: "svelte branch to use"
required: true
type: string
default: "svelte-4"
default: "main"
repo:
description: "svelte repository to use"
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ecosystem-ci-selected.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ on:
description: "svelte ref to use"
required: true
type: string
default: "svelte-4"
default: "main"
repo:
description: "svelte repository to use"
required: true
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ecosystem-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ on:
description: "svelte ref to use"
required: true
type: string
default: "svelte-4"
default: "main"
repo:
description: "svelte repository to use"
required: true
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
- run: pnpm i --frozen-lockfile
- run: >-
pnpm tsx ecosystem-ci.ts
--${{ inputs.refType || github.event.client_payload.refType || 'branch' }} ${{ inputs.ref || github.event.client_payload.ref || 'svelte-4' }}
--${{ inputs.refType || github.event.client_payload.refType || 'branch' }} ${{ inputs.ref || github.event.client_payload.ref || 'main' }}
--repo ${{ inputs.repo || github.event.client_payload.repo || 'sveltejs/svelte' }}
${{ matrix.suite }}
id: ecosystem-ci-run
Expand All @@ -79,7 +79,7 @@ jobs:
env:
WORKFLOW_NAME: ci
REF_TYPE: ${{ inputs.refType || github.event.client_payload.refType || 'branch' }}
REF: ${{ inputs.ref || github.event.client_payload.ref || 'svelte-4' }}
REF: ${{ inputs.ref || github.event.client_payload.ref || 'main' }}
REPO: ${{ inputs.repo || github.event.client_payload.repo || 'sveltejs/svelte' }}
SUITE: ${{ matrix.suite }}
STATUS: ${{ job.status }}
Expand Down
2 changes: 1 addition & 1 deletion ecosystem-ci.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ cli
.option('--repo <repo>', 'svelte repository to use', {
default: 'sveltejs/svelte',
})
.option('--branch <branch>', 'svelte branch to use', { default: 'svelte-4' })
.option('--branch <branch>', 'svelte branch to use', { default: 'main' })
.option('--tag <tag>', 'svelte tag to use')
.option('--commit <commit>', 'svelte commit sha to use')
.option('--release <version>', 'svelte release to use from npm registry')
Expand Down
7 changes: 5 additions & 2 deletions tests/_selftest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@ export async function test(options: RunOptions) {
`invalid checkout, expected package.json with "name":"svelte-ecosystem-ci" in ${dir}`,
)
}
pkg.scripts.selftestscript =
"[ -f ../../svelte/packages/svelte/compiler.cjs ] || (echo 'svelte build failed' && exit 1)"
const compilerOutputFile =
options.svelteMajor === 4
? ' ../../svelte/packages/svelte/compiler.cjs'
: '../../svelte/packages/svelte/compiler/index.js'
pkg.scripts.selftestscript = `[ -f ${compilerOutputFile} ] || (echo 'svelte build failed' && exit 1)`
await fs.promises.writeFile(
pkgFile,
JSON.stringify(pkg, null, 2),
Expand Down
2 changes: 1 addition & 1 deletion utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ export async function setupSvelteRepo(options: Partial<RepoOptions>) {
await setupRepo({
repo,
dir: sveltePath,
branch: 'svelte-4',
branch: 'main',
shallow: true,
...options,
})
Expand Down
Loading