diff --git a/.github/actions/init/action.yml b/.github/actions/init/action.yml index c4b5abcb21..d8434e3bf6 100644 --- a/.github/actions/init/action.yml +++ b/.github/actions/init/action.yml @@ -120,4 +120,4 @@ runs: - name: Install Playwright Browsers if: inputs.playwright-enabled == 'true' && steps.playwright-cache.outputs.cache-hit != 'true' shell: bash - run: npx playwright install --with-deps + run: npx playwright install chromium diff --git a/.github/workflows/release-canary.yml b/.github/workflows/release-canary.yml index 1b01a9ae28..0da2c24608 100644 --- a/.github/workflows/release-canary.yml +++ b/.github/workflows/release-canary.yml @@ -39,13 +39,15 @@ jobs: id: version-packages run: npm run version:canary | tail -1 >> "$GITHUB_OUTPUT" + - name: Build release + run: npx turbo build $TURBO_ARGS --force # TODO: Remove --force, when appropriate + - name: Canary release if: steps.version-packages.outputs.success == '1' - run: npx turbo build $TURBO_ARGS && changeset publish --tag canary --no-git-tag + run: npm run release:canary env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} NPM_CONFIG_PROVENANCE: true - TURBO_FORCE: true # TODO: Remove when comfortable - name: Trigger workflows on related repos uses: actions/github-script@v6 diff --git a/.github/workflows/release-snapshot.yml b/.github/workflows/release-snapshot.yml index 3825422fdc..8dbc771fd0 100644 --- a/.github/workflows/release-snapshot.yml +++ b/.github/workflows/release-snapshot.yml @@ -66,13 +66,15 @@ jobs: id: version-packages run: npm run version:snapshot ${{ steps.extract-snapshot-name.outputs.name }} | tail -1 >> "$GITHUB_OUTPUT" + - name: Build release + run: npx turbo build $TURBO_ARGS + - name: Snapshot release if: steps.version-packages.outputs.success == '1' - run: npx turbo build $TURBO_ARGS && changeset publish --tag snapshot --no-git-tag + run: npm run release:snapshot env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} NPM_CONFIG_PROVENANCE: true - TURBO_FORCE: true # TODO: Remove when comfortable - name: Package info if: steps.version-packages.outputs.success == '1' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e32bc3fe86..b6a80f1756 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -45,15 +45,15 @@ jobs: turbo-token: ${{ secrets.TURBO_TOKEN }} playwright-enabled: true # Must be present to enable caching on branched workflows - - name: Build - run: npx turbo build $TURBO_ARGS + - name: Build release + run: npx turbo build $TURBO_ARGS --force - name: Create Release PR id: changesets uses: changesets/action@v1 with: commit: "chore(repo): Version packages" - publish: npx changeset publish && git push --follow-tags + publish: npm run release env: GITHUB_TOKEN: ${{ secrets.CLERK_COOKIE_PAT }} NPM_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/package.json b/package.json index a52ed080ab..d9c427716c 100644 --- a/package.json +++ b/package.json @@ -24,9 +24,9 @@ "lint:publint": "FORCE_COLOR=1 turbo lint:publint", "nuke": "./scripts/nuke.sh", "prepare": "husky install", - "release": "TURBO_FORCE=true FORCE_COLOR=1 npm run build -- --force && changeset publish && git push --follow-tags", - "release:canary": "TURBO_FORCE=true FORCE_COLOR=1 npm run build && changeset publish --tag canary --no-git-tag", - "release:snapshot": "TURBO_FORCE=true FORCE_COLOR=1 npm run build && changeset publish --tag snapshot --no-git-tag", + "release": "changeset publish && git push --follow-tags", + "release:canary": "changeset publish --tag canary --no-git-tag", + "release:snapshot": "changeset publish --tag snapshot --no-git-tag", "release:verdaccio": "if [ \"$(npm config get registry)\" = \"https://registry.npmjs.org/\" ]; then echo 'Error: Using default registry' && exit 1; else TURBO_CONCURRENCY=1 npm run build && changeset publish --no-git-tag; fi", "test": "FORCE_COLOR=1 turbo test --concurrency=${TURBO_CONCURRENCY:-80%}", "test:cache:clear": "FORCE_COLOR=1 turbo test:cache:clear --continue --concurrency=${TURBO_CONCURRENCY:-80%}",