From d795b925c6277b86d03b458d9cf6c09d07c46125 Mon Sep 17 00:00:00 2001
From: Jahed Ahmed <jahed@snyk.io>
Date: Thu, 9 Jun 2022 14:03:06 +0000
Subject: [PATCH] chore(ci): persist v2 artifacts in a single job

Involves persisting signed artifacts too which we previously didn't do.
---
 .circleci/config.yml | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index aa98956387..05285f2135 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -626,13 +626,21 @@ jobs:
       - save_cache:
           key: go-build-{{ arch }}-{{ checksum "cliv2/go.sum" }}
           paths: [/home/circleci/go/pkg/mod]
-      - store_artifacts:
-          path: ./cliv2/bin
       - persist_to_workspace:
           root: .
           paths:
             - ./cliv2/bin
 
+  v2-prepare-release:
+    executor: linux
+    working_directory: /home/circleci/snyk
+    steps:
+      - checkout
+      - attach_workspace:
+          at: .
+      - store_artifacts:
+          path: ./cliv2/bin
+
   v2-test-linux-amd64:
     executor: linux
     working_directory: /home/circleci/snyk
@@ -1022,7 +1030,6 @@ workflows:
           requires:
             - v2 / Build (linux/amd64)
           test_snyk_command: /mnt/ramdisk/snyk/cliv2/bin/snyk_linux_amd64
-
       - v2-sign-darwin-amd64:
           name: v2 / Sign (darwin/amd64)
           context: snyk-macos-signing
@@ -1033,3 +1040,10 @@ workflows:
           context: snyk-windows-signing
           requires:
             - v2 / Build (windows/amd64)
+      - v2-prepare-release:
+          name: v2 / Prepare Release
+          requires:
+            - v2 / Build (linux/amd64)
+            - v2 / Build (linux/arm64)
+            - v2 / Sign (darwin/amd64)
+            - v2 / Sign (windows/amd64)