Skip to content

Commit 6f4c9a5

Browse files
committed
fix(ci): correct workflow variable passing
- Adds explicit inputs for variables required by the reusable `build-and-publish` workflow. - Updates the `orchestrator` workflow to pass these variables correctly. - Removes a duplicated job from the `orchestrator` workflow.
1 parent 247ac33 commit 6f4c9a5

File tree

2 files changed

+22
-20
lines changed

2 files changed

+22
-20
lines changed

.github/workflows/build-and-publish.yml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,19 @@ name: 'Build and Publish Bundle'
33

44
on:
55
workflow_call:
6+
inputs:
7+
cli-package-name:
8+
description: 'The name of the CLI package.'
9+
required: true
10+
type: 'string'
11+
npm-registry-scope:
12+
description: 'NPM registry scope'
13+
required: true
14+
type: 'string'
15+
npm-registry-url:
16+
description: 'NPM registry URL'
17+
required: true
18+
type: 'string'
619
outputs:
720
version:
821
description: 'The version of the published package'
@@ -113,9 +126,9 @@ jobs:
113126
--file Dockerfile \
114127
--tag "${IMAGE_TAG}" \
115128
--build-arg CLI_VERSION=${{ needs.publish-bundle.outputs.version }} \
116-
--build-arg NPM_REGISTRY_SCOPE=${{ vars.NPM_REGISTRY_SCOPE }} \
117-
--build-arg NPM_REGISTRY_URL=${{ vars.NPM_REGISTRY_URL }} \
118-
--build-arg CLI_PACKAGE_NAME=${{ vars.CLI_PACKAGE_NAME }} \
129+
--build-arg NPM_REGISTRY_SCOPE=${{ inputs.npm-registry-scope }} \
130+
--build-arg NPM_REGISTRY_URL=${{ inputs.npm-registry-url }} \
131+
--build-arg CLI_PACKAGE_NAME=${{ inputs.cli-package-name }} \
119132
--secret id=GITHUB_TOKEN
120133
docker push "${IMAGE_TAG}"
121134
echo "uri=${IMAGE_TAG}" >> "$GITHUB_OUTPUT"

.github/workflows/orchestrator.yml

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,29 +37,18 @@ jobs:
3737
name: 'Build and Publish CI Bundle'
3838
needs: 'lint'
3939
uses: './.github/workflows/build-and-publish.yml'
40-
41-
ci:
42-
name: 'CI Checks'
43-
needs: 'lint'
44-
uses: './.github/workflows/ci.yml'
45-
46-
get-vars:
47-
name: 'Get Environment Variables'
48-
runs-on: 'ubuntu-latest'
49-
environment: 'dev'
50-
outputs:
51-
cli-package-name: '${{ steps.get-vars.outputs.cli-package-name }}'
52-
steps:
53-
- id: 'get-vars'
54-
run: 'echo ''cli-package-name=''''${{ vars.CLI_PACKAGE_NAME }}'''''' >> "$GITHUB_OUTPUT"'
40+
with:
41+
cli-package-name: '${{ vars.CLI_PACKAGE_NAME }}'
42+
npm-registry-scope: '${{ vars.NPM_REGISTRY_SCOPE }}'
43+
npm-registry-url: '${{ vars.NPM_REGISTRY_URL }}'
5544

5645
e2e:
5746
name: 'E2E Checks'
58-
needs: ['build-and-publish', 'get-vars']
47+
needs: ['build-and-publish']
5948
uses: './.github/workflows/e2e.yml'
6049
with:
6150
version: '${{ needs.build-and-publish.outputs.version }}'
62-
cli-package-name: '${{ needs.get-vars.outputs.cli-package-name }}'
51+
cli-package-name: '${{ vars.CLI_PACKAGE_NAME }}'
6352
image-uri: '${{ needs.build-and-publish.outputs.image-uri }}'
6453
secrets:
6554
GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'

0 commit comments

Comments
 (0)