From f10d060cd9642ed7fc73ef56fc193bb415bc4681 Mon Sep 17 00:00:00 2001
From: Quentin Gliech <quenting@element.io>
Date: Thu, 14 Sep 2023 09:46:07 +0200
Subject: [PATCH] Put the docker image info in the release body

---
 .github/workflows/build.yaml | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b529e7c5f..70ff0c991 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -121,6 +121,9 @@ jobs:
     env:
       IMAGE: ghcr.io/matrix-org/matrix-authentication-service
 
+    outputs:
+      metadata: ${{ steps.bake.output.metadata }}
+
     permissions:
       contents: read
       packages: write
@@ -246,11 +249,11 @@ jobs:
       - name: Create the archives
         run: |
           for arch in x86_64 aarch64; do
-            mv artifacts/${arch}-unknown-linux-musl/release/mas-cli dist/mas-cli
+            mv artifacts/target/${arch}-unknown-linux-musl/release/mas-cli dist/mas-cli
             chmod u=rwx,go=rx dist/mas-cli
             tar -czvf mas-cli-${arch}-linux.tar.gz --owner=0 --group=0 -C dist/ .
           
-            mv artifacts/${arch}-apple-darwin/release/mas-cli dist/mas-cli
+            mv artifacts/target/${arch}-apple-darwin/release/mas-cli dist/mas-cli
             chmod u=rwx,go=rx dist/mas-cli
             tar -czvf mas-cli-${arch}-macos.tar.gz --owner=0 --group=0 -C dist/ .
           done
@@ -258,6 +261,25 @@ jobs:
       - name: Prepare a release
         uses: softprops/action-gh-release@v1
         with:
+          body: |
+            ### Docker image
+            
+            Regular image: 
+            
+              - Digest: `${{ env.IMAGE }}@${{ fromJSON(needs.build-image.outputs.metadata).regular['containerimage.digest'] }}`
+              - Tags:
+                ```
+                ${{ fromJSON(needs.build-image.outputs.metadata).regular['image.name'] }}`
+                ```
+            
+            Debug variant: 
+            
+              - Digest: `${{ env.IMAGE }}@${{ fromJSON(needs.build-image.outputs.metadata).debug['containerimage.digest'] }}`
+              - Tags:
+                ```
+                ${{ fromJSON(needs.build-image.outputs.metadata).debug['image.name'] }}`
+                ```
+
           files: |
             mas-cli-aarch64-linux.tar.gz
             mas-cli-aarch64-macos.tar.gz