From 0745904a22cbce54f41d94add4b5dcd6d4e04da3 Mon Sep 17 00:00:00 2001
From: Shane Friedman <smoores-gpg@friedmans.us>
Date: Thu, 9 Oct 2025 22:14:38 -0400
Subject: [PATCH] fix: use correct env var to detect gitlab CI for OIDC

---
 .yarn/versions/c5da5cd9.yml                   | 36 +++++++++++++++++++
 .../sources/commands/npm/publish.ts           |  2 +-
 packages/plugin-npm/sources/npmHttpUtils.ts   |  2 +-
 3 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 .yarn/versions/c5da5cd9.yml

diff --git a/.yarn/versions/c5da5cd9.yml b/.yarn/versions/c5da5cd9.yml
new file mode 100644
index 00000000000..92926325f4c
--- /dev/null
+++ b/.yarn/versions/c5da5cd9.yml
@@ -0,0 +1,36 @@
+releases:
+  "@yarnpkg/cli": patch
+  "@yarnpkg/core": patch
+  "@yarnpkg/plugin-npm": patch
+  "@yarnpkg/plugin-npm-cli": patch
+
+declined:
+  - "@yarnpkg/plugin-catalog"
+  - "@yarnpkg/plugin-compat"
+  - "@yarnpkg/plugin-constraints"
+  - "@yarnpkg/plugin-dlx"
+  - "@yarnpkg/plugin-essentials"
+  - "@yarnpkg/plugin-exec"
+  - "@yarnpkg/plugin-file"
+  - "@yarnpkg/plugin-git"
+  - "@yarnpkg/plugin-github"
+  - "@yarnpkg/plugin-http"
+  - "@yarnpkg/plugin-init"
+  - "@yarnpkg/plugin-interactive-tools"
+  - "@yarnpkg/plugin-jsr"
+  - "@yarnpkg/plugin-link"
+  - "@yarnpkg/plugin-nm"
+  - "@yarnpkg/plugin-pack"
+  - "@yarnpkg/plugin-patch"
+  - "@yarnpkg/plugin-pnp"
+  - "@yarnpkg/plugin-pnpm"
+  - "@yarnpkg/plugin-stage"
+  - "@yarnpkg/plugin-typescript"
+  - "@yarnpkg/plugin-version"
+  - "@yarnpkg/plugin-workspace-tools"
+  - "@yarnpkg/builder"
+  - "@yarnpkg/doctor"
+  - "@yarnpkg/extensions"
+  - "@yarnpkg/nm"
+  - "@yarnpkg/pnpify"
+  - "@yarnpkg/sdks"
diff --git a/packages/plugin-npm-cli/sources/commands/npm/publish.ts b/packages/plugin-npm-cli/sources/commands/npm/publish.ts
index f4422311f23..004ded92895 100644
--- a/packages/plugin-npm-cli/sources/commands/npm/publish.ts
+++ b/packages/plugin-npm-cli/sources/commands/npm/publish.ts
@@ -166,7 +166,7 @@ export default class NpmPublishCommand extends BaseCommand {
             ident,
             otp: this.otp,
             jsonResponse: true,
-            allowOidc: Boolean(process.env.CI && (process.env.GITHUB_ACTIONS || process.env.GITLAB)),
+            allowOidc: Boolean(process.env.CI && (process.env.GITHUB_ACTIONS || process.env.GITLAB_CI)),
           });
         }
 
diff --git a/packages/plugin-npm/sources/npmHttpUtils.ts b/packages/plugin-npm/sources/npmHttpUtils.ts
index 33527ef79ab..e086dd35f7b 100644
--- a/packages/plugin-npm/sources/npmHttpUtils.ts
+++ b/packages/plugin-npm/sources/npmHttpUtils.ts
@@ -593,7 +593,7 @@ function getOtpHeaders(otp: string) {
 async function getOidcToken(registry: string, {configuration, ident}: {configuration: Configuration, ident: Ident}): Promise<string | null> {
   let idToken: string | null = null;
 
-  if (process.env.GITLAB) {
+  if (process.env.GITLAB_CI) {
     idToken = process.env.NPM_ID_TOKEN || null;
   } else if (process.env.GITHUB_ACTIONS) {
     if (!(process.env.ACTIONS_ID_TOKEN_REQUEST_URL && process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN))