From 77124857a30a667cb5e2ca33c13fb0c1dc6a217c Mon Sep 17 00:00:00 2001
From: Daniel Lipovetsky <dlipovetsky@d2iq.com>
Date: Wed, 18 Oct 2023 11:12:51 -0700
Subject: [PATCH] build: Generate and upload release artifacts in one step

---
 .github/workflows/release.yaml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 9648f0663..0681d4502 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -43,14 +43,6 @@ jobs:
             REGISTRY=${{ env.registry }} \
             CAPVCD_IMG=${{ env.repository }} \
             VERSION=${{ env.version }}
-      - name: Generate GitHub release artifacts
-        # See note on make variables, above.
-        run: |
-          make release-manifests \
-            --makefile d2iq.Makefile
-            REGISTRY=${{ env.registry }} \
-            CAPVCD_IMG=${{ env.repository }} \
-            VERSION=${{ env.version }}
       - name: Create (draft) GitHub release
         run: |
           gh release create ${{ env.version }} \
@@ -58,8 +50,17 @@ jobs:
             --draft
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Upload GitHub release artifacts
+      - name: Generate release artifacts, and attach them to the GitHub release
+        # Because steps do not share data, the artifacts must be generated and
+        # uploaded in one step.
+        #
+        # Also see note on make variables, above.
         run: |
+          make release-manifests \
+            --makefile d2iq.Makefile
+            REGISTRY=${{ env.registry }} \
+            CAPVCD_IMG=${{ env.repository }} \
+            VERSION=${{ env.version }}
           gh release upload ${{ env.version }} \
             metadata.yaml \
             templates/infrastructure-components.yaml