@@ -154,23 +154,20 @@ jobs:
154154 steps :
155155 - name : Checkout Repo @ SHA - ${{ github.sha }}
156156 uses : actions/checkout@v4
157-
158157 - uses : hashicorp/setup-terraform@v2
159-
160158 - name : download layerARNs
161159 uses : actions/download-artifact@v4
162160 with :
163- name : ${{ env.LAYER_NAME }}
161+ pattern : ${{ env.LAYER_NAME }}-*
164162 path : ${{ env.LAYER_NAME }}
165-
163+ merge-multiple : true
166164 - name : show layerARNs
167165 run : |
168166 for file in ${{ env.LAYER_NAME }}/*
169167 do
170168 echo $file
171169 cat $file
172170 done
173-
174171 - name : generate layer-note
175172 working-directory : ${{ env.LAYER_NAME }}
176173 run : |
@@ -181,38 +178,49 @@ jobs:
181178 read arn < $file
182179 echo "| " $file " | " $arn " |" >> ../layer-note
183180 done
184- cd ..
185- cat layer-note
186-
181+ cat ../layer-note
187182 - name : generate tf layer
188183 working-directory : ${{ env.LAYER_NAME }}
189184 run : |
190- echo "locals {" >> ../layer .tf
191- echo " sdk_layer_arns = {" >> ../layer .tf
185+ echo "locals {" >> ../layer_arns .tf
186+ echo " sdk_layer_arns = {" >> ../layer_arns .tf
192187 for file in *
193188 do
194189 read arn < $file
195- echo " \""$file"\" = \""$arn"\"" >> ../layer .tf
190+ echo " \""$file"\" = \""$arn"\"" >> ../layer_arns .tf
196191 done
197192 cd ..
198- echo " }" >> layer.tf
199- echo "}" >> layer.tf
200- terraform fmt layer.tf
201- cat layer.tf
202-
203- - name : upload layer tf file
204- uses : actions/upload-artifact@v4
193+ echo " }" >> layer_arns.tf
194+ echo "}" >> layer_arns.tf
195+ terraform fmt layer_arns.tf
196+ cat layer_arns.tf
197+ - name : download layer.zip
198+ uses : actions/download-artifact@v4
205199 with :
206- name : layer.tf
207- path : layer.tf
208-
200+ name : layer.zip
201+ - name : Get commit hash
202+ id : commit
203+ run : echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
204+ - name : Create Release Notes
205+ run : |
206+ echo "AWS OpenTelemetry Lambda Layer for Java version ${{ github.event.inputs.version }}-${{ steps.commit.outputs.sha_short }}" > release_notes.md
207+ echo "" >> release_notes.md
208+ echo "" >> release_notes.md
209+ echo "See new Lambda Layer ARNs:" >> release_notes.md
210+ echo "" >> release_notes.md
211+ cat layer-note >> release_notes.md
212+ echo "" >> release_notes.md
213+ echo "Notes:" >> release_notes.md
209214 - name : Create GH release
210215 id : create_release
211216 env :
212217 GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
213218 run : |
214219 gh release create --target "$GITHUB_REF_NAME" \
215- --title "Release lambda-v${{ github.event.inputs.version }}" \
220+ --title "Release lambda-v${{ github.event.inputs.version }}-${{ steps.commit.outputs.sha_short }}" \
221+ --notes-file release_notes.md \
216222 --draft \
217- "lambda-v${{ github.event.inputs.version }}" \
218- layer.tf
223+ "lambda-v${{ github.event.inputs.version }}-${{ steps.commit.outputs.sha_short }}" \
224+ layer_arns.tf layer.zip
225+ echo Removing release_notes.md ...
226+ rm -f release_notes.md
0 commit comments