From ea5336133bb9bcc912cbd88c9012c1ff06e7c81d Mon Sep 17 00:00:00 2001 From: peternhale Date: Tue, 18 Aug 2026 14:20:44 -0600 Subject: [PATCH 1/2] ci: use main shared workflows --- .github/workflows/ci.yml | 6 +++--- .github/workflows/dependabot-automerge.yml | 2 +- .github/workflows/e2e.yml | 4 ++-- .github/workflows/manual-publish.yml | 2 +- .github/workflows/nightly.yml | 2 +- .github/workflows/promote-prerelease.yml | 2 +- .github/workflows/promote-stable.yml | 2 +- .github/workflows/publish.yml | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0f07d88b..2143955b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: with: persist-credentials: false - name: Set up Node and install dependencies - uses: salesforcecli/github-workflows/.github/actions/setupNodeAndInstall@ph/W-23832274-pnpm-stable-promotion + uses: salesforcecli/github-workflows/.github/actions/setupNodeAndInstall@main with: node-version: '24' package-manager: pnpm @@ -47,7 +47,7 @@ jobs: with: persist-credentials: false - name: Set up Node and install dependencies - uses: salesforcecli/github-workflows/.github/actions/setupNodeAndInstall@ph/W-23832274-pnpm-stable-promotion + uses: salesforcecli/github-workflows/.github/actions/setupNodeAndInstall@main with: node-version: '24' package-manager: pnpm @@ -65,7 +65,7 @@ jobs: with: persist-credentials: false - name: Set up Node and install dependencies - uses: salesforcecli/github-workflows/.github/actions/setupNodeAndInstall@ph/W-23832274-pnpm-stable-promotion + uses: salesforcecli/github-workflows/.github/actions/setupNodeAndInstall@main with: node-version: '24' package-manager: pnpm diff --git a/.github/workflows/dependabot-automerge.yml b/.github/workflows/dependabot-automerge.yml index ec1c59e1..55cd310e 100644 --- a/.github/workflows/dependabot-automerge.yml +++ b/.github/workflows/dependabot-automerge.yml @@ -14,7 +14,7 @@ permissions: jobs: automerge: - uses: salesforcecli/github-workflows/.github/workflows/automerge.yml@ph/W-23832274-pnpm-stable-promotion + uses: salesforcecli/github-workflows/.github/workflows/automerge.yml@main with: mergeMethod: squash maxVersionBump: minor diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index f6b94c1a..e81fb346 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -18,7 +18,7 @@ jobs: lfs: true persist-credentials: false - name: Set up Node and install dependencies - uses: salesforcecli/github-workflows/.github/actions/setupNodeAndInstall@ph/W-23832274-pnpm-stable-promotion + uses: salesforcecli/github-workflows/.github/actions/setupNodeAndInstall@main with: node-version: '24' package-manager: pnpm @@ -53,7 +53,7 @@ jobs: lfs: true persist-credentials: false - name: Set up Node and install dependencies - uses: salesforcecli/github-workflows/.github/actions/setupNodeAndInstall@ph/W-23832274-pnpm-stable-promotion + uses: salesforcecli/github-workflows/.github/actions/setupNodeAndInstall@main with: node-version: '24' package-manager: pnpm diff --git a/.github/workflows/manual-publish.yml b/.github/workflows/manual-publish.yml index 3e20bfaf..a3779675 100644 --- a/.github/workflows/manual-publish.yml +++ b/.github/workflows/manual-publish.yml @@ -61,7 +61,7 @@ permissions: jobs: publish: - uses: salesforcecli/github-workflows/.github/workflows/vscode-manual-publish.yml@ph/W-23832274-pnpm-stable-promotion + uses: salesforcecli/github-workflows/.github/workflows/vscode-manual-publish.yml@main with: extension-name: lana vsix-name-pattern: 'lana-*.vsix' diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 414caba3..cdd74a2f 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -27,7 +27,7 @@ permissions: jobs: nightly-release: - uses: salesforcecli/github-workflows/.github/workflows/vscode-publish-extensions.yml@ph/W-23832274-pnpm-stable-promotion + uses: salesforcecli/github-workflows/.github/workflows/vscode-publish-extensions.yml@main with: branch: ${{ inputs.branch || github.ref_name }} # TODO(W-23832274): Switch to `changed` after a live nightly confirms the diff --git a/.github/workflows/promote-prerelease.yml b/.github/workflows/promote-prerelease.yml index 3a5af7cd..f01f6ae9 100644 --- a/.github/workflows/promote-prerelease.yml +++ b/.github/workflows/promote-prerelease.yml @@ -24,7 +24,7 @@ permissions: jobs: promote: - uses: salesforcecli/github-workflows/.github/workflows/vscode-promote-prerelease.yml@ph/W-23832274-pnpm-stable-promotion + uses: salesforcecli/github-workflows/.github/workflows/vscode-promote-prerelease.yml@main with: min-tag-age-days: ${{ inputs.min-tag-age-days || '7' }} vsix-name-pattern: 'lana-*.vsix' diff --git a/.github/workflows/promote-stable.yml b/.github/workflows/promote-stable.yml index 6b9b6635..ec5063c6 100644 --- a/.github/workflows/promote-stable.yml +++ b/.github/workflows/promote-stable.yml @@ -21,7 +21,7 @@ permissions: jobs: promote: - uses: salesforcecli/github-workflows/.github/workflows/vscode-promote-stable.yml@ph/W-23832274-pnpm-stable-promotion + uses: salesforcecli/github-workflows/.github/workflows/vscode-promote-stable.yml@main with: extension-name: lana vsix-name-pattern: 'lana-*.vsix' diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e53a6f62..060d0fdb 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -35,7 +35,7 @@ permissions: jobs: publish: - uses: salesforcecli/github-workflows/.github/workflows/vscode-publish-extensions.yml@ph/W-23832274-pnpm-stable-promotion + uses: salesforcecli/github-workflows/.github/workflows/vscode-publish-extensions.yml@main with: branch: ${{ github.ref_name }} extensions: lana From d8d3fc1de870677fdbc6bab64bf0533248b5734f Mon Sep 17 00:00:00 2001 From: peternhale Date: Wed, 19 Aug 2026 05:40:14 -0600 Subject: [PATCH 2/2] fix: align distribution policy workflow refs --- scripts/verify-web-distribution.mjs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/verify-web-distribution.mjs b/scripts/verify-web-distribution.mjs index 4fab2509..d574231c 100644 --- a/scripts/verify-web-distribution.mjs +++ b/scripts/verify-web-distribution.mjs @@ -80,7 +80,7 @@ for (const requiredText of [ for (const requiredText of [ 'workflow_dispatch:', "# - cron: '0 7 * * 3'", - 'uses: salesforcecli/github-workflows/.github/workflows/vscode-promote-prerelease.yml@ph/W-23832274-pnpm-stable-promotion', + 'uses: salesforcecli/github-workflows/.github/workflows/vscode-promote-prerelease.yml@main', "min-tag-age-days: ${{ inputs.min-tag-age-days || '7' }}", "vsix-name-pattern: 'lana-*.vsix'", "exclude-web-vsix: 'true'", @@ -100,7 +100,7 @@ if (/^ schedule:/m.test(promotePrerelease)) { for (const requiredText of [ 'workflow_dispatch:', "# - cron: '0 6 * * 3'", - 'uses: salesforcecli/github-workflows/.github/workflows/vscode-promote-stable.yml@ph/W-23832274-pnpm-stable-promotion', + 'uses: salesforcecli/github-workflows/.github/workflows/vscode-promote-stable.yml@main', 'extension-name: lana', "vsix-name-pattern: 'lana-*.vsix'", "exclude-web-vsix: 'true'", @@ -142,7 +142,7 @@ if (!ci.includes('vsce package --target web --no-dependencies')) { for (const requiredText of [ "# - cron: '0 4 * * *'", "branch:\n description: 'Branch to release from'", - 'uses: salesforcecli/github-workflows/.github/workflows/vscode-publish-extensions.yml@ph/W-23832274-pnpm-stable-promotion', + 'uses: salesforcecli/github-workflows/.github/workflows/vscode-publish-extensions.yml@main', 'extensions: lana', "pre-release: 'true'", 'branch: ${{ inputs.branch || github.ref_name }}', @@ -180,7 +180,7 @@ for (const requiredText of [ 'use none for internal-only', 'publish-web-vsix:', "publish-web-vsix: ${{ inputs.publish-web-vsix && 'true' || 'false' }}", - 'uses: salesforcecli/github-workflows/.github/workflows/vscode-manual-publish.yml@ph/W-23832274-pnpm-stable-promotion', + 'uses: salesforcecli/github-workflows/.github/workflows/vscode-manual-publish.yml@main', 'extension-name: lana', "vsix-name-pattern: 'lana-*.vsix'", 'required-ci-checks: >-',