From 27349ba62842c9c9a1b7d8e6099b1b8541f9b7e6 Mon Sep 17 00:00:00 2001
From: Noe Luaces <nluaces@redhat.com>
Date: Thu, 8 Jun 2023 18:25:03 +0200
Subject: [PATCH] fix getting the manifest from the wrong directory

---
 .circleci/config.yml | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 24db392ee..26c5ccc80 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -348,15 +348,9 @@ workflows:
             - test
             - build_and_push_test_images
 
-      - generate_manifest:
-          <<: *run_for_numeric_tags
-          <<: *release_requires
-
       - publish-github-release-artifacts:
           <<: *run_for_numeric_tags
           <<: *release_requires
-          requires:
-            - generate_manifest
 
       - publish-github-release-images:
           <<: *run_for_numeric_tags
@@ -481,24 +475,13 @@ jobs:
           goos: linux
           goarch: arm64
           platform: linux-arm64
-
-      - persist_to_workspace:
-          root: .
-          paths:
-              - dist
-
-  generate_manifest:
-    executor:
-      name: go/default
-      tag: "1.19"
-    steps:
-      - checkout
       - run: make generate-manifest
       - run: mkdir skupper-manifest
       - run: cp ./manifest.json skupper-manifest
       - persist_to_workspace:
           root: .
           paths:
+            - dist
             - skupper-manifest
 
   main_tests_minikube_local_cluster:
@@ -548,8 +531,8 @@ jobs:
                 tar -zcf "${BASEDIR}/archives/skupper-cli-${VERSION}-$p.tgz" *
               fi
             done
-            cp skupper-manifest/manifest.json "${BASEDIR}/archives"
             cd ${BASEDIR}
+            cp "${BASEDIR}/skupper-manifest/manifest.json" "${BASEDIR}/archives"
             ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -replace -prerelease -draft ${VERSION} "${BASEDIR}/archives"
 
   publish-github-release-images: