diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3b4c99e..6d2e89a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -68,7 +68,7 @@ jobs: - name: enable corepack run: | corepack enable - corepack prepare yarn@4.10.3 --activate + corepack prepare yarn@4.11.0 --activate - name: cache yarn dependencies uses: actions/cache@v4 with: @@ -78,16 +78,13 @@ jobs: ${{ runner.os }}-yarn- - run: yarn install --immutable - run: yarn build - - name: Upgrade npm for OIDC trusted publishing - run: npm install -g npm@latest - name: Publish to npm run: | - # Use npm CLI directly - requires npm >= 11.5.1 for OIDC trusted publishing - # Yarn 4.10.3 OIDC support appears broken despite all env vars being set correctly + # Yarn 4.11.0 with OIDC trusted publishing if [ "${{ needs.check-version.outputs.is-prerelease }}" == "true" ]; then - npm publish --provenance --access public --tag ${{ needs.check-version.outputs.npm-tag }} + yarn npm publish --access public --tag ${{ needs.check-version.outputs.npm-tag }} else - npm publish --provenance --access public + yarn npm publish --access public fi create-release: diff --git a/.yarnrc.yml b/.yarnrc.yml index e5a48c2..529120e 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -1,2 +1,11 @@ nodeLinker: node-modules + +npmPublishProvenance: true + npmRegistryServer: 'https://registry.npmjs.org' +npmPublishRegistry: "https://registry.npmjs.org" + +npmScopes: + reforge-com: + npmRegistryServer: "https://registry.npmjs.org" + npmPublishRegistry: "https://registry.npmjs.org" diff --git a/package.json b/package.json index d1c400c..c3ff0d2 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "packageManager": "yarn@4.10.3", + "packageManager": "yarn@4.11.0", "name": "@reforge-com/cli", "version": "0.0.9", "author": "Jeffrey Chupp @semanticart",