Skip to content

Commit 6695932

Browse files
authored
fix(ci): create one layer artifact per region & merge (#3808)
1 parent c135cec commit 6695932

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/publish_v2_layer.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -257,11 +257,12 @@ jobs:
257257
integrity_hash: ${{ inputs.source_code_integrity_hash }}
258258
artifact_name: ${{ inputs.source_code_artifact_name }}
259259

260-
- name: Download CDK layer artifact
260+
- name: Download CDK layer artifacts
261261
uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe # v4.1.2
262262
with:
263-
name: cdk-layer-stack
264-
path: cdk-layer-stack/
263+
path: cdk-layer-stack
264+
pattern: cdk-layer-stack-* # merge all Layer artifacts created per region earlier (reusable_deploy_v2_layer_stack.yml; step "Save Layer ARN artifact")
265+
merge-multiple: true
265266
- name: Replace layer versions in documentation
266267
run: |
267268
ls -la cdk-layer-stack/

.github/workflows/reusable_deploy_v2_layer_stack.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -193,16 +193,15 @@ jobs:
193193
run: |
194194
mkdir cdk-layer-stack
195195
jq -r -c '.LayerV2Stack.LatestLayerArn' cdk-outputs.json > cdk-layer-stack/${{ matrix.region }}-layer-version.txt
196-
jq -r -c '.LayerV2Stack.LatestLayerArm64Arn' cdk-outputs.json >> cdk-layer-stack/${{ matrix.region }}-layer-version.txt
196+
jq -r -c '.LayerV2Stack.LatestLayerArm64Arn' cdk-outputs.json > cdk-layer-stack/${{ matrix.region }}-layer-version.txt
197197
cat cdk-layer-stack/${{ matrix.region }}-layer-version.txt
198198
- name: Save Layer ARN artifact
199199
if: ${{ inputs.stage == 'PROD' }}
200200
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
201201
with:
202-
name: cdk-layer-stack
202+
name: cdk-layer-stack-${{ matrix.region }}
203203
path: ./layer/cdk-layer-stack/* # NOTE: upload-artifact does not inherit working-directory setting.
204204
if-no-files-found: error
205205
retention-days: 1
206-
overwrite: true
207206
- name: CDK Deploy Canary
208207
run: npx cdk deploy --app cdk.out --context region=${{ matrix.region }} --parameters DeployStage="${{ inputs.stage }}" --parameters HasARM64Support=${{ matrix.has_arm64_support }} 'CanaryV2Stack' --require-approval never --verbose

0 commit comments

Comments
 (0)