From 50bd06624745dc7522e06afae9dc7976b038fdfa Mon Sep 17 00:00:00 2001 From: Lei Wang <66336933+wangzlei@users.noreply.github.com> Date: Fri, 28 Feb 2025 13:34:27 -0800 Subject: [PATCH 1/2] Update release-lambda.yml Add Lambda layer artifact in release assets --- .github/workflows/release-lambda.yml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/release-lambda.yml b/.github/workflows/release-lambda.yml index 52ac161c5..095e6d8b5 100644 --- a/.github/workflows/release-lambda.yml +++ b/.github/workflows/release-lambda.yml @@ -170,23 +170,22 @@ jobs: - name: generate tf layer working-directory: ${{ env.LAYER_NAME }} run: | - echo "locals {" >> ../layer.tf - echo " sdk_layer_arns = {" >> ../layer.tf + echo "locals {" >> ../layer_arns.tf + echo " sdk_layer_arns = {" >> ../layer_arns.tf for file in * do read arn < $file - echo " \""$file"\" = \""$arn"\"" >> ../layer.tf + echo " \""$file"\" = \""$arn"\"" >> ../layer_arns.tf done cd .. - echo " }" >> layer.tf - echo "}" >> layer.tf - terraform fmt layer.tf - cat layer.tf - - name: upload layer tf file - uses: actions/upload-artifact@v4 + echo " }" >> layer_arns.tf + echo "}" >> layer_arns.tf + terraform fmt layer_arns.tf + cat layer_arns.tf + - name: download layer.zip + uses: actions/download-artifact@v4 with: - name: layer.tf - path: layer.tf + name: layer.zip - name: Get commit hash id: commit run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT @@ -210,6 +209,6 @@ jobs: --notes-file release_notes.md \ --draft \ "lambda-v${{ github.event.inputs.version }}-${{ steps.commit.outputs.sha_short }}" \ - layer.tf + layer_arns.tf layer.zip echo Removing release_notes.md ... rm -f release_notes.md From b0b079abcc372311b62bf2f4fe2eff99d2e9b5cb Mon Sep 17 00:00:00 2001 From: Lei Wang <66336933+wangzlei@users.noreply.github.com> Date: Fri, 28 Feb 2025 15:23:26 -0800 Subject: [PATCH 2/2] Update release-lambda.yml --- .github/workflows/release-lambda.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-lambda.yml b/.github/workflows/release-lambda.yml index 095e6d8b5..ec124a95f 100644 --- a/.github/workflows/release-lambda.yml +++ b/.github/workflows/release-lambda.yml @@ -159,14 +159,14 @@ jobs: - name: generate layer-note working-directory: ${{ env.LAYER_NAME }} run: | - echo "| Region | Layer ARN |" >> layer-note - echo "| ---- | ---- |" >> layer-note + echo "| Region | Layer ARN |" >> ../layer-note + echo "| ---- | ---- |" >> ../layer-note for file in * do read arn < $file - echo "| " $file " | " $arn " |" >> layer-note + echo "| " $file " | " $arn " |" >> ../layer-note done - cat layer-note + cat ../layer-note - name: generate tf layer working-directory: ${{ env.LAYER_NAME }} run: | @@ -196,7 +196,7 @@ jobs: echo "" >> release_notes.md echo "See new Lambda Layer ARNs:" >> release_notes.md echo "" >> release_notes.md - cat ${{ env.LAYER_NAME }}/layer-note >> release_notes.md + cat layer-note >> release_notes.md echo "" >> release_notes.md echo "Notes:" >> release_notes.md - name: Create GH release