fix: token

Author: fi3ework

.github/workflows/rspress-ecosystem-ci-from-commit.yml

@@ -56,6 +56,11 @@ jobs:
     env:
       ECOSYSTEM_CI_REF: ${{ inputs.commitSHA }}
       ECOSYSTEM_CI_TYPE: 'commit'
+      NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+      RSBUILD_NETLIFY_SITE_ID: ${{ secrets.RSBUILD_NETLIFY_SITE_ID }}
+      RSLIB_NETLIFY_SITE_ID: ${{ secrets.RSLIB_NETLIFY_SITE_ID }}
+      RSPACK_NETLIFY_SITE_ID: ${{ secrets.RSPACK_NETLIFY_SITE_ID }}
+      RSTEST_NETLIFY_SITE_ID: ${{ secrets.RSTEST_NETLIFY_SITE_ID }}
     steps:
       - uses: actions/checkout@v5
       - uses: ./.github/actions/build-rspress
@@ -91,6 +96,11 @@ jobs:
     env:
       ECOSYSTEM_CI_REF: ${{ inputs.commitSHA }}
       ECOSYSTEM_CI_TYPE: 'commit'
+      NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+      RSBUILD_NETLIFY_SITE_ID: ${{ secrets.RSBUILD_NETLIFY_SITE_ID }}
+      RSLIB_NETLIFY_SITE_ID: ${{ secrets.RSLIB_NETLIFY_SITE_ID }}
+      RSPACK_NETLIFY_SITE_ID: ${{ secrets.RSPACK_NETLIFY_SITE_ID }}
+      RSTEST_NETLIFY_SITE_ID: ${{ secrets.RSTEST_NETLIFY_SITE_ID }}
     steps:
       - uses: actions/checkout@v5
       - uses: moonrepo/setup-rust@v1

.github/workflows/rspress-ecosystem-ci-from-pr.yml

@@ -53,6 +53,12 @@ jobs:
   execute-selected-suite:
     runs-on: ubuntu-latest
     if: "inputs.suite != '-'"
+    env:
+      NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+      RSBUILD_NETLIFY_SITE_ID: ${{ secrets.RSBUILD_NETLIFY_SITE_ID }}
+      RSLIB_NETLIFY_SITE_ID: ${{ secrets.RSLIB_NETLIFY_SITE_ID }}
+      RSPACK_NETLIFY_SITE_ID: ${{ secrets.RSPACK_NETLIFY_SITE_ID }}
+      RSTEST_NETLIFY_SITE_ID: ${{ secrets.RSTEST_NETLIFY_SITE_ID }}
     steps:
       - uses: actions/checkout@v5
       - uses: ./.github/actions/build-rspress
@@ -85,6 +91,12 @@ jobs:
       fail-fast: false
     runs-on: ${{ matrix.os }}
     name: execute-all (${{ matrix.suite }})
+    env:
+      NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+      RSBUILD_NETLIFY_SITE_ID: ${{ secrets.RSBUILD_NETLIFY_SITE_ID }}
+      RSLIB_NETLIFY_SITE_ID: ${{ secrets.RSLIB_NETLIFY_SITE_ID }}
+      RSPACK_NETLIFY_SITE_ID: ${{ secrets.RSPACK_NETLIFY_SITE_ID }}
+      RSTEST_NETLIFY_SITE_ID: ${{ secrets.RSTEST_NETLIFY_SITE_ID }}
     steps:
       - uses: actions/checkout@v5
       - uses: ./.github/actions/build-rspress

.github/workflows/rspress-ecosystem-ci-selected.yml

@@ -62,6 +62,11 @@ jobs:
     env:
       ECOSYSTEM_CI_REF: ${{ inputs.ref }}
       ECOSYSTEM_CI_TYPE: 'branch'
+      NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+      RSBUILD_NETLIFY_SITE_ID: ${{ secrets.RSBUILD_NETLIFY_SITE_ID }}
+      RSLIB_NETLIFY_SITE_ID: ${{ secrets.RSLIB_NETLIFY_SITE_ID }}
+      RSPACK_NETLIFY_SITE_ID: ${{ secrets.RSPACK_NETLIFY_SITE_ID }}
+      RSTEST_NETLIFY_SITE_ID: ${{ secrets.RSTEST_NETLIFY_SITE_ID }}
     steps:
       - uses: actions/checkout@v5
       - uses: ./.github/actions/build-rspress
@@ -83,6 +88,11 @@ jobs:
     env:
       ECOSYSTEM_CI_REF: ${{ inputs.ref }}
       ECOSYSTEM_CI_TYPE: 'branch'
+      NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+      RSBUILD_NETLIFY_SITE_ID: ${{ secrets.RSBUILD_NETLIFY_SITE_ID }}
+      RSLIB_NETLIFY_SITE_ID: ${{ secrets.RSLIB_NETLIFY_SITE_ID }}
+      RSPACK_NETLIFY_SITE_ID: ${{ secrets.RSPACK_NETLIFY_SITE_ID }}
+      RSTEST_NETLIFY_SITE_ID: ${{ secrets.RSTEST_NETLIFY_SITE_ID }}
     strategy:
       matrix:
         include:

tests/rspress/rsbuild.ts

@@ -2,7 +2,7 @@ import type { RunOptions } from '../../types';
 import { cd, runInRepo } from '../../utils';
 import { MESSAGE, deployPreviewToNetlify } from './utils/_netlify';
 
-const SITE_ID_ENV = 'RSPRESS_NETLIFY_SITE_ID_RSBUILD';
+const SITE_ID_ENV = 'RSBUILD_NETLIFY_SITE_ID';
 
 export async function test(options: RunOptions) {
   await runInRepo({

tests/rspress/rslib.ts

@@ -2,7 +2,7 @@ import type { RunOptions } from '../../types';
 import { cd, runInRepo } from '../../utils';
 import { MESSAGE, deployPreviewToNetlify } from './utils/_netlify';
 
-const SITE_ID_ENV = 'RSPRESS_NETLIFY_SITE_ID_RSLIB';
+const SITE_ID_ENV = 'RSLIB_NETLIFY_SITE_ID';
 
 export async function test(options: RunOptions) {
   await runInRepo({

tests/rspress/rspack.ts

@@ -2,7 +2,7 @@ import type { RunOptions } from '../../types';
 import { cd, runInRepo } from '../../utils';
 import { MESSAGE, deployPreviewToNetlify } from './utils/_netlify';
 
-const SITE_ID_ENV = 'RSPRESS_NETLIFY_SITE_ID_RSPACK';
+const SITE_ID_ENV = 'RSPACK_NETLIFY_SITE_ID';
 
 export async function test(options: RunOptions) {
   await runInRepo({

tests/rspress/rstest.ts

@@ -2,7 +2,7 @@ import type { RunOptions } from '../../types';
 import { cd, runInRepo } from '../../utils';
 import { MESSAGE, deployPreviewToNetlify } from './utils/_netlify';
 
-const SITE_ID_ENV = 'RSPRESS_NETLIFY_SITE_ID_RSTEST';
+const SITE_ID_ENV = 'RSTEST_NETLIFY_SITE_ID';
 
 export async function test(options: RunOptions) {
   await runInRepo({

tests/rspress/utils/_netlify.ts

@@ -7,8 +7,8 @@ interface DeployOptions {
   siteIdEnvVar?: string;
 }
 
-const DEFAULT_OUTPUT_DIR = 'dist';
-const DEFAULT_NETLIFY_CLI = 'netlify-cli@17.38.1';
+const DEFAULT_OUTPUT_DIR = './website/doc_build';
+const DEFAULT_NETLIFY_CLI = 'netlify-cli@23.10.0';
 const DEFAULT_ALIAS = process.env.RSPRESS_NETLIFY_ALIAS ?? 'ecosystem-ci';
 export const MESSAGE = `${process.env.ECOSYSTEM_CI_TYPE}:${process.env.ECOSYSTEM_CI_REF}`;
 
@@ -36,9 +36,11 @@ export async function deployPreviewToNetlify(options: DeployOptions) {
     return;
   }
 
+  console.log(`[rspress][netlify] Deploying with alias: ${alias}`);
+
   const cliSpecifier = process.env.RSPRESS_NETLIFY_CLI ?? DEFAULT_NETLIFY_CLI;
   const result =
-    await $`pnpm dlx ${cliSpecifier} deploy --dir=${outputDir} --alias=${alias} --message=${message} --site=${siteId} --confirm --json`;
+    await $`pnpm --package=${cliSpecifier} dlx netlify deploy --dir=${outputDir} --alias=${alias} --message=${message} --site=${siteId} --auth=${authToken} --json`;
 
   try {
     const parsed = JSON.parse(result);