From 0db0ba01a19e2caeab36cd1693aa89721c0bf4ed Mon Sep 17 00:00:00 2001 From: Andrea Amorosi Date: Tue, 20 Feb 2024 10:13:07 +0100 Subject: [PATCH 1/5] chore(ci): restore layer arn artifact uploads --- .github/workflows/publish_layer.yml | 2 ++ .github/workflows/reusable_deploy_layer_stack.yml | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish_layer.yml b/.github/workflows/publish_layer.yml index a28c015553..7a4b352518 100644 --- a/.github/workflows/publish_layer.yml +++ b/.github/workflows/publish_layer.yml @@ -99,6 +99,8 @@ jobs: with: name: cdk-layer-stack path: cdk-layer-stack/ + pattern: cdk-layer-stack-* + merge-multiple: true - name: Replace layer versions in documentation run: | ls -la cdk-layer-stack/ diff --git a/.github/workflows/reusable_deploy_layer_stack.yml b/.github/workflows/reusable_deploy_layer_stack.yml index b360e249d7..c96184be71 100644 --- a/.github/workflows/reusable_deploy_layer_stack.yml +++ b/.github/workflows/reusable_deploy_layer_stack.yml @@ -93,10 +93,9 @@ jobs: if: ${{ inputs.stage == 'PROD' }} uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 with: - name: cdk-layer-stack + name: cdk-layer-stack-${{ matrix.region }} path: ./cdk-layer-stack/* # NOTE: upload-artifact does not inherit working-directory setting. if-no-files-found: error retention-days: 1 - overwrite: true - name: CDK deploy canary run: npm run cdk -w layers -- deploy --app cdk.out --context region=${{ matrix.region }} 'CanaryStack' --require-approval never --verbose --outputs-file cdk-outputs.json From e397b7fb62e1a96df2d914ffd417424e0ae2dacc Mon Sep 17 00:00:00 2001 From: Andrea Amorosi Date: Tue, 20 Feb 2024 10:20:47 +0100 Subject: [PATCH 2/5] chore(ci): step name --- .github/workflows/publish_layer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_layer.yml b/.github/workflows/publish_layer.yml index 7a4b352518..99174f8ca7 100644 --- a/.github/workflows/publish_layer.yml +++ b/.github/workflows/publish_layer.yml @@ -94,7 +94,7 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: ref: ${{ github.sha }} - - name: Download CDK layer artifact + - name: Download CDK layer artifacts uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe # v4.1.2 with: name: cdk-layer-stack From 8f96001d802083b947554c5fb6d5b66cae7638b2 Mon Sep 17 00:00:00 2001 From: Andrea Amorosi Date: Tue, 20 Feb 2024 10:25:42 +0100 Subject: [PATCH 3/5] chore(ci): remove artifact name --- .github/workflows/publish_layer.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/publish_layer.yml b/.github/workflows/publish_layer.yml index 99174f8ca7..5e8c5755be 100644 --- a/.github/workflows/publish_layer.yml +++ b/.github/workflows/publish_layer.yml @@ -97,7 +97,6 @@ jobs: - name: Download CDK layer artifacts uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe # v4.1.2 with: - name: cdk-layer-stack path: cdk-layer-stack/ pattern: cdk-layer-stack-* merge-multiple: true From f59c6ebeccb1dba8d2e6a603ccee89bb2b2a6a5e Mon Sep 17 00:00:00 2001 From: Andrea Amorosi Date: Tue, 20 Feb 2024 10:26:55 +0100 Subject: [PATCH 4/5] chore(ci): remove trailing slash from path --- .github/workflows/publish_layer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_layer.yml b/.github/workflows/publish_layer.yml index 5e8c5755be..037792f55a 100644 --- a/.github/workflows/publish_layer.yml +++ b/.github/workflows/publish_layer.yml @@ -97,7 +97,7 @@ jobs: - name: Download CDK layer artifacts uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe # v4.1.2 with: - path: cdk-layer-stack/ + path: cdk-layer-stack pattern: cdk-layer-stack-* merge-multiple: true - name: Replace layer versions in documentation From b8d4879c1dfe7fbf92725bd8681f529c3a1eb751 Mon Sep 17 00:00:00 2001 From: Andrea Amorosi Date: Tue, 20 Feb 2024 10:29:19 +0100 Subject: [PATCH 5/5] chore(ci): add comment --- .github/workflows/publish_layer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_layer.yml b/.github/workflows/publish_layer.yml index 037792f55a..59d9e364f3 100644 --- a/.github/workflows/publish_layer.yml +++ b/.github/workflows/publish_layer.yml @@ -98,7 +98,7 @@ jobs: uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe # v4.1.2 with: path: cdk-layer-stack - pattern: cdk-layer-stack-* + pattern: cdk-layer-stack-* # merge all Layer artifacts created per region earlier (reusable_deploy_layer_stack.yml; step "Save Layer ARN artifact") merge-multiple: true - name: Replace layer versions in documentation run: |