diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f7b63a195c..436fefae04 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -473,8 +473,8 @@ jobs: github.repository == 'denoland/deno' && github.ref == 'refs/heads/main' env: - WPT_FYI_STAGING_USER: ${{ secrets.WPT_FYI_STAGING_USER }} - WPT_FYI_STAGING_PW: ${{ secrets.WPT_FYI_STAGING_PW }} + WPT_FYI_USER: ${{ secrets.WPT_FYI_USER }} + WPT_FYI_PW: ${{ secrets.WPT_FYI_PW }} GITHUB_TOKEN: ${{ secrets.DENOBOT_PAT }} run: | ./target/release/deno run --allow-all \ diff --git a/.github/workflows/wpt_epoch.yml b/.github/workflows/wpt_epoch.yml index 87dcd510ec..86fb0d727b 100644 --- a/.github/workflows/wpt_epoch.yml +++ b/.github/workflows/wpt_epoch.yml @@ -71,7 +71,7 @@ jobs: - name: Upload wpt results to wpt.fyi env: - WPT_FYI_STAGING_USER: ${{ secrets.WPT_FYI_STAGING_USER }} - WPT_FYI_STAGING_PW: ${{ secrets.WPT_FYI_STAGING_PW }} + WPT_FYI_USER: ${{ secrets.WPT_FYI_USER }} + WPT_FYI_PW: ${{ secrets.WPT_FYI_PW }} run: | deno run -A ./tools/upload_wptfyi.js wptreport.json --from-raw-file diff --git a/tools/upload_wptfyi.js b/tools/upload_wptfyi.js index 8625231671..097f5a512c 100644 --- a/tools/upload_wptfyi.js +++ b/tools/upload_wptfyi.js @@ -4,8 +4,8 @@ import { gzip } from "https://deno.land/x/compress@v0.3.8/gzip/mod.ts"; -const user = Deno.env.get("WPT_FYI_STAGING_USER"); -const password = Deno.env.get("WPT_FYI_STAGING_PW"); +const user = Deno.env.get("WPT_FYI_USER"); +const password = Deno.env.get("WPT_FYI_PW"); const fromRawFile = Deno.args.includes("--from-raw-file"); @@ -27,7 +27,7 @@ if (fromRawFile) { const basicAuthToken = btoa(`${user}:${password}`); -const resp = await fetch("https://staging.wpt.fyi/api/results/upload", { +const resp = await fetch("https://wpt.fyi/api/results/upload", { method: "POST", body: form, headers: { @@ -47,7 +47,7 @@ if (!resp.ok) { if (!fromRawFile && Deno.args.includes("--ghstatus")) { const githubToken = Deno.env.get("GITHUB_TOKEN"); const taskId = body.split(" ")[1]; - const url = `https://staging.wpt.fyi/results/?run_id=${taskId}`; + const url = `https://wpt.fyi/results/?run_id=${taskId}`; const commit = Deno.args[0]; const resp = await fetch( `https://api.github.com/repos/denoland/deno/statuses/${commit}`,