@@ -70,40 +70,9 @@ permissions:
7070 actions : read
7171
7272jobs :
73- determine-changes :
74- runs-on : ubuntu-latest
75- outputs :
76- selected-extensions : ${{ steps.changes.outputs.selected-extensions }}
77- version-bumps : ${{ steps.changes.outputs.version-bumps }}
78- steps :
79- - name : Checkout
80- uses : actions/checkout@v6
81- with :
82- fetch-depth : 0
83-
84- - name : Setup Node.js
85- uses : actions/setup-node@v6
86- with :
87- node-version : ' 22.x'
88-
89- - name : Install dependencies
90- uses : salesforcecli/github-workflows/.github/actions/vscode/npm-install-with-retries@feat/add-vscode-extension-ci
91-
92- - name : Determine changes and version bumps
93- id : changes
94- env :
95- IS_NIGHTLY : ' true'
96- VERSION_BUMP : ' auto'
97- PRE_RELEASE : ' true'
98- IS_PROMOTION : ' false'
99- SELECTED_EXTENSIONS : ${{ inputs.extensions }}
100- run : |
101- node node_modules/github-workflows/packages/vscode-extension-ci/dist/cli.js ext-change-detector
102-
10373 display-release-plan :
104- needs : [determine-changes]
10574 runs-on : ubuntu-latest
106- if : needs.determine-changes.outputs.selected- extensions != ''
75+ if : inputs. extensions != ''
10776 steps :
10877 - name : Checkout
10978 uses : actions/checkout@v6
@@ -123,10 +92,10 @@ jobs:
12392 BRANCH : ${{ inputs.branch || github.ref_name }}
12493 BUILD_TYPE : ${{ github.event_name }}
12594 IS_NIGHTLY : ' true'
126- VERSION_BUMP : ${{ needs.determine-changes.outputs. version-bumps }}
95+ VERSION_BUMP : ${{ inputs. version-bump }}
12796 REGISTRIES : ${{ inputs.registries }}
12897 PRE_RELEASE : ' true'
129- SELECTED_EXTENSIONS : ${{ needs.determine-changes.outputs.selected- extensions }}
98+ SELECTED_EXTENSIONS : ${{ inputs. extensions }}
13099 run : |
131100 echo "=== EXTENSION RELEASE PLAN ==="
132101 echo "Branch: $BRANCH"
@@ -179,9 +148,9 @@ jobs:
179148 echo "=== END OF RELEASE PLAN ==="
180149
181150 bump-versions :
182- needs : [determine-changes ]
151+ needs : []
183152 runs-on : ubuntu-latest
184- if : needs.determine-changes.outputs.selected- extensions != ''
153+ if : inputs. extensions != ''
185154 steps :
186155 - name : Checkout
187156 uses : actions/checkout@v6
@@ -199,8 +168,8 @@ jobs:
199168
200169 - name : Bump versions and tag for selected extensions
201170 env :
202- VERSION_BUMP : ${{ needs.determine-changes.outputs. version-bumps }}
203- SELECTED_EXTENSIONS : ${{ needs.determine-changes.outputs.selected- extensions }}
171+ VERSION_BUMP : ${{ inputs. version-bump }}
172+ SELECTED_EXTENSIONS : ${{ inputs. extensions }}
204173 PRE_RELEASE : ${{ inputs.pre-release || github.event.inputs.pre-release || 'false' }}
205174 IS_NIGHTLY : ' true'
206175 IS_PROMOTION : ' false'
@@ -297,18 +266,29 @@ jobs:
297266 outputs :
298267 artifact-name : ${{ steps.calc.outputs.artifact-name }}
299268 steps :
300- - name : Checkout
301- uses : actions/checkout@v6
302-
303269 - name : Calculate artifact name
304270 id : calc
305- uses : salesforcecli/github-workflows/.github/actions/vscode/calculate-artifact-name@feat/add-vscode-extension-ci
306- with :
307- artifact-name : vsix-packages
308- dry-run : ${{ inputs.dry-run || github.event.inputs.dry-run || 'false' }}
271+ run : |
272+ BASE_NAME="vsix-packages"
273+ RUN_NUMBER="${{ github.run_number }}"
274+ IS_DRY_RUN="${{ inputs.dry-run || github.event.inputs.dry-run || 'false' }}"
275+
276+ # Check if already suffixed
277+ if [[ "$BASE_NAME" =~ -dry-run$ ]] || [[ "$BASE_NAME" =~ -release$ ]]; then
278+ ARTIFACT_NAME="$BASE_NAME"
279+ else
280+ if [ "$IS_DRY_RUN" = "true" ]; then
281+ ARTIFACT_NAME="${BASE_NAME}-${RUN_NUMBER}-dry-run"
282+ else
283+ ARTIFACT_NAME="${BASE_NAME}-${RUN_NUMBER}-release"
284+ fi
285+ fi
286+
287+ echo "artifact-name=$ARTIFACT_NAME" >> $GITHUB_OUTPUT
288+ echo "Artifact name: $ARTIFACT_NAME"
309289
310290 package :
311- needs : [bump-versions, calculate-artifact-name, determine-changes ]
291+ needs : [bump-versions, calculate-artifact-name]
312292 uses : salesforcecli/github-workflows/.github/workflows/vscode-package.yml@feat/add-vscode-extension-ci
313293 with :
314294 branch : ${{ inputs.branch || github.ref_name }}
@@ -317,7 +297,7 @@ jobs:
317297 pre-release : ${{ inputs.pre-release || github.event.inputs.pre-release || 'false' }}
318298
319299 determine-publish-matrix :
320- needs : [determine-changes, calculate-artifact-name]
300+ needs : [calculate-artifact-name]
321301 runs-on : ubuntu-latest
322302 outputs :
323303 matrix : ${{ steps.matrix.outputs.matrix }}
@@ -337,7 +317,7 @@ jobs:
337317 id : matrix
338318 env :
339319 REGISTRIES : ${{ inputs.registries }}
340- SELECTED_EXTENSIONS : ${{ needs.determine-changes.outputs.selected- extensions }}
320+ SELECTED_EXTENSIONS : ${{ inputs. extensions }}
341321 IS_NIGHTLY : ' true'
342322 run : |
343323 # Skip marketplace publishing for nightly builds
@@ -527,9 +507,9 @@ jobs:
527507
528508 create-github-releases :
529509 name : Create GitHub Releases
530- needs : [package, determine-changes, calculate-artifact-name]
510+ needs : [package, calculate-artifact-name]
531511 runs-on : ubuntu-latest
532- if : needs.package.result == 'success' && needs.determine-changes.outputs.selected- extensions != '' && github.event_name != 'pull_request'
512+ if : needs.package.result == 'success' && inputs. extensions != '' && github.event_name != 'pull_request'
533513 steps :
534514 - name : Checkout
535515 uses : actions/checkout@v6
@@ -555,10 +535,10 @@ jobs:
555535 env :
556536 GITHUB_TOKEN : ${{ secrets.IDEE_GH_TOKEN }}
557537 GITHUB_REPOSITORY : ${{ github.repository }}
558- SELECTED_EXTENSIONS : ${{ needs.determine-changes.outputs.selected- extensions }}
538+ SELECTED_EXTENSIONS : ${{ inputs. extensions }}
559539 IS_NIGHTLY : ' true'
560540 PRE_RELEASE : ' true'
561- VERSION_BUMP : ${{ needs.determine-changes.outputs. version-bumps }}
541+ VERSION_BUMP : ${{ inputs. version-bump }}
562542 DRY_RUN : ${{ inputs.dry-run || github.event.inputs.dry-run || 'false' }}
563543 BRANCH : ${{ inputs.branch || github.ref_name }}
564544 VSIX_ARTIFACTS_PATH : ./vsix-artifacts
@@ -707,7 +687,7 @@ jobs:
707687 slack-notify :
708688 name : Slack Notification
709689 needs :
710- [determine-changes, bump-versions, package, publish]
690+ [bump-versions, package, publish]
711691 runs-on : ubuntu-latest
712692 if : always() && needs.publish.result == 'success' && (inputs.dry-run != 'true' && github.event.inputs.dry-run != 'true')
713693 steps :
@@ -720,8 +700,8 @@ jobs:
720700 id : extension-details
721701 run : |
722702 # Get selected extensions and their details
723- SELECTED_EXTENSIONS="${{ needs.determine-changes.outputs.selected- extensions }}"
724- VERSION_BUMP="${{ needs.determine-changes.outputs. version-bumps }}"
703+ SELECTED_EXTENSIONS="${{ inputs. extensions }}"
704+ VERSION_BUMP="${{ inputs. version-bump }}"
725705 PRE_RELEASE="true"
726706
727707 # Initialize arrays for extension details
@@ -814,7 +794,7 @@ jobs:
814794 slack-notify-failure :
815795 name : Slack Failure Notification
816796 needs :
817- [determine-changes, bump-versions, package, publish]
797+ [bump-versions, package, publish]
818798 runs-on : ubuntu-latest
819799 if : always() && needs.publish.result == 'failure' && (inputs.dry-run != 'true' && github.event.inputs.dry-run != 'true')
820800 steps :
@@ -827,8 +807,8 @@ jobs:
827807 id : extension-details
828808 run : |
829809 # Get selected extensions and their details
830- SELECTED_EXTENSIONS="${{ needs.determine-changes.outputs.selected- extensions }}"
831- VERSION_BUMP="${{ needs.determine-changes.outputs. version-bumps }}"
810+ SELECTED_EXTENSIONS="${{ inputs. extensions }}"
811+ VERSION_BUMP="${{ inputs. version-bump }}"
832812 PRE_RELEASE="true"
833813
834814 # Initialize arrays for extension details
0 commit comments