chore(repo): Fix nightly e2e tests #6262
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 @@ on: | |
| jobs: | ||
| pr-title-lint: | ||
| runs-on: ubuntu-latest | ||
| # DISABLED: This workflow is temporarily disabled. Remove this condition to re-enable. | ||
| steps: | ||
| - name: Checkout Repo | ||
| uses: actions/checkout@v4 | ||
|
|
@@ -27,4 +28,4 @@ jobs: | |
| run: | | ||
| npm init --scope=clerk --yes | ||
| npm i --save-dev @commitlint/config-conventional @commitlint/cli globby --audit=false --fund=false | ||
| echo '${{ github.event.pull_request.title }}' | npm exec @commitlint/cli -- --config commitlint.config.ts | ||
This file contains hidden or 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,6 +1,5 @@ | ||
| .cache | ||
| .changeset | ||
| .idea | ||
| .next | ||
| .temp_integration | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -76,6 +76,10 @@ export const applicationConfig = () => { | |
| } | ||
| return self; | ||
| }, | ||
| /** | ||
| * Creates a new application directory and copies the template files (and any overrides) to it. | ||
| * The application directory is created in the `constants.TMP_DIR` directory. | ||
| */ | ||
| commit: async (opts?: { stableHash?: string }) => { | ||
| const { stableHash } = opts || {}; | ||
| logger.info(`Creating project "${name}"`); | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -60,14 +60,17 @@ export const longRunningApplication = (params: LongRunningApplicationParams) => | |
| // the first time this is called, the app starts and the state is persisted in the state file | ||
| init: async () => { | ||
| try { | ||
| console.log(`[${name}] Starting initialization...`); | ||
| const publishableKey = params.env.publicVariables.get('CLERK_PUBLISHABLE_KEY'); | ||
| const secretKey = params.env.privateVariables.get('CLERK_SECRET_KEY'); | ||
| const apiUrl = params.env.privateVariables.get('CLERK_API_URL'); | ||
| const { instanceType, frontendApi: frontendApiUrl } = parsePublishableKey(publishableKey); | ||
| console.log(`[${name}] Instance type: ${instanceType}, Frontend API URL: ${frontendApiUrl}`); | ||
|
|
||
| if (instanceType !== 'development') { | ||
| console.log('Clerk: skipping setup of testing tokens for non-development instance'); | ||
| } else { | ||
| console.log(`[${name}] Setting up testing tokens...`); | ||
| await clerkSetup({ | ||
| publishableKey, | ||
| frontendApiUrl, | ||
|
|
@@ -76,32 +79,42 @@ export const longRunningApplication = (params: LongRunningApplicationParams) => | |
| apiUrl, | ||
| dotenv: false, | ||
| }); | ||
| console.log(`[${name}] Testing tokens setup completed`); | ||
| } | ||
| } catch (error) { | ||
| console.error('Error setting up testing tokens:', error); | ||
| throw error; | ||
| } | ||
| try { | ||
| console.log(`[${name}] Committing config...`); | ||
| app = await config.commit(); | ||
| console.log(`[${name}] Config committed successfully`); | ||
| } catch (error) { | ||
| console.error('Error committing config:', error); | ||
| throw error; | ||
| } | ||
| try { | ||
| console.log(`[${name}] Setting up environment...`); | ||
| await app.withEnv(params.env); | ||
| console.log(`[${name}] Environment setup completed`); | ||
| } catch (error) { | ||
| console.error('Error setting up environment:', error); | ||
| throw error; | ||
| } | ||
| try { | ||
| console.log(`[${name}] Running app setup...`); | ||
| await app.setup(); | ||
| console.log(`[${name}] App setup completed`); | ||
| } catch (error) { | ||
| console.error('Error during app setup:', error); | ||
| throw error; | ||
| } | ||
| try { | ||
| console.log(`[${name}] Starting app in dev mode...`); | ||
| const { port, serverUrl, pid } = await app.dev({ detached: true }); | ||
| console.log(`[${name}] App started successfully - Port: ${port}, PID: ${pid}, URL: ${serverUrl}`); | ||
| stateFile.addLongRunningApp({ port, serverUrl, pid, id, appDir: app.appDir, env: params.env.toJson() }); | ||
| console.log(`[${name}] State file updated with app information`); | ||
| } catch (error) { | ||
| console.error('Error during app dev:', error); | ||
| throw error; | ||
|
|
||
This file contains hidden or 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 | ||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -2,7 +2,7 @@ import { constants } from '../constants'; | |||||||||||||||||||||||
| import { fs } from '../scripts'; | ||||||||||||||||||||||||
| import type { EnvironmentConfig } from './environment'; | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| export type AppParams = { | ||||||||||||||||||||||||
| id: string; | ||||||||||||||||||||||||
| port: number; | ||||||||||||||||||||||||
| serverUrl: string; | ||||||||||||||||||||||||
|
|
@@ -83,6 +83,11 @@ const createStateFile = () => { | |||||||||||||||||||||||
| return read().clerkJsHttpServerPid; | ||||||||||||||||||||||||
| }; | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| const debug = () => { | ||||||||||||||||||||||||
| const json = read(); | ||||||||||||||||||||||||
| console.log('state file', JSON.stringify(json, null, 2)); | ||||||||||||||||||||||||
| }; | ||||||||||||||||||||||||
|
Comment on lines
+86
to
+89
There was a problem hiding this comment. 🛠️ Refactor suggestion Add explicit return type and JSDoc documentation. The + /**
+ * Logs the current state file content in a pretty-printed format for debugging purposes.
+ */
- const debug = () => {
+ const debug = (): void => {
const json = read();
console.log('state file', JSON.stringify(json, null, 2));
};📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents |
||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| return { | ||||||||||||||||||||||||
| remove, | ||||||||||||||||||||||||
| setStandAloneApp, | ||||||||||||||||||||||||
|
|
@@ -91,6 +96,7 @@ const createStateFile = () => { | |||||||||||||||||||||||
| getClerkJsHttpServerPid, | ||||||||||||||||||||||||
| addLongRunningApp, | ||||||||||||||||||||||||
| getLongRunningApps, | ||||||||||||||||||||||||
| debug, | ||||||||||||||||||||||||
| }; | ||||||||||||||||||||||||
| }; | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -151,9 +151,9 @@ const withSessionTasks = base | |
| .setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-session-tasks').pk) | ||
| .setEnvVariable('private', 'CLERK_ENCRYPTION_KEY', constants.E2E_CLERK_ENCRYPTION_KEY || 'a-key'); | ||
|
|
||
| const withBillingJwtV2 = base | ||
| .clone() | ||
| .setId('withBillingJwtV2') | ||
| .setEnvVariable('private', 'CLERK_API_URL', 'https://api.clerkstage.dev') | ||
| .setEnvVariable('private', 'CLERK_SECRET_KEY', instanceKeys.get('with-billing-staging').sk) | ||
| .setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-billing-staging').pk); | ||
|
|
@@ -197,7 +197,7 @@ export const envs = { | |
| withSignInOrUpEmailLinksFlow, | ||
| withSignInOrUpwithRestrictedModeFlow, | ||
| withSessionTasks, | ||
| withBillingJwtV2, | ||
| withBilling, | ||
| withWhatsappPhoneCode, | ||
| sessionsProd1, | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💡 Verification agent
❓ Verification inconclusive
Add an explicit failure after the readiness-polling loop
If Verdaccio never comes up within the 10 attempts, the script silently proceeds to the publish step and will fail later with a much less obvious error. Abort early to surface the root cause:
for i in {1..10}; do if curl -f ${{ inputs.registry }}/ > /dev/null 2>&1; then echo "Verdaccio is up and running" break fi echo "Waiting for Verdaccio to start (attempt $i)..." sleep 2 done +# Bail out if Verdaccio never became ready +if ! curl -f ${{ inputs.registry }}/ > /dev/null 2>&1; then + echo "Verdaccio did not start after 10 attempts" >&2 + exit 1 +fiEnforce failure if Verdaccio isn’t ready
Add an explicit check after the readiness-poll loop in
.github/actions/verdaccio/action.ymlso the workflow aborts early if Verdaccio never comes up:for i in {1..10}; do if curl -f ${{ inputs.registry }}/ > /dev/null 2>&1; then echo "Verdaccio is up and running" break fi echo "Waiting for Verdaccio to start (attempt $i)…" sleep 2 done +# Bail out if Verdaccio never became ready +if ! curl -f ${{ inputs.registry }}/ > /dev/null 2>&1; then + echo "Verdaccio did not start after 10 attempts" >&2 + exit 1 +fi pnpm config set $(echo ${{ inputs.registry }} | sed -E 's/https?://')/:_authToken secretToken📝 Committable suggestion
🤖 Prompt for AI Agents