ci: fix bin builds

.circleci/config.yml

@@ -118,19 +118,27 @@ commands:
         type: string
         default: ""
     steps:
+      - run:
+          name: Set git tag in the environment"
+          command: |
+            echo TAG=$(git describe --tags) >> $BASH_ENV
       - run:
           name: Make artifact
           command: |
             mkdir shuttle
             mv target/<< parameters.target >>/release/cargo-shuttle<< parameters.suffix >> shuttle/cargo-shuttle<< parameters.suffix >>
             mv LICENSE shuttle/
             mv README.md shuttle/
-            mkdir artifacts
-            tar -cvzf artifacts/cargo-shuttle-${CIRCLE_TAG}-<< parameters.target >>.tar.gz shuttle
+            mkdir -p artifacts/<< parameters.target >>
+            cp $BASH_ENV artifacts/bash.env
+            tar -cvzf artifacts/<< parameters.target >>/cargo-shuttle-$TAG-<< parameters.target >>.tar.gz shuttle
+      # Persist the bash environment to the workspace as well, we need it for the release job.
+      # https://discuss.circleci.com/t/share-environment-variable-between-different-job/45647/4
       - persist_to_workspace:
           root: artifacts
           paths:
-            - cargo-shuttle-${CIRCLE_TAG}-<< parameters.target >>.tar.gz
+            - << parameters.target >>/*
+            - bash.env
 
 jobs:
   workspace-fmt:
@@ -353,98 +361,94 @@ jobs:
     steps:
       - attach_workspace:
           at: artifacts
+      - run:
+          name: "Set tag in environment"
+          command: |
+            cat artifacts/bash.env >> "$BASH_ENV"
+            rm artifacts/bash.env
       - run:
           name: "Publish Release on GitHub"
-          environment:
-            GITHUB_TOKEN: $GITHUB_TOKEN
+          # Since each binary is in a sub directory named after its target, we flatten
+          # the artifacts directory before passing it to ghr
           command: |
+            find artifacts -mindepth 2 -type f -exec mv -t artifacts {} +
             go install github.com/tcnksm/ghr@v0.16.0
-            ghr -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete -draft ${CIRCLE_TAG} artifacts/
+            ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete -draft ${TAG} ./artifacts/
 
 workflows:
   version: 2
   ci:
     jobs:
-      - workspace-fmt
-      - workspace-clippy:
-          name: workspace-clippy-<< matrix.framework >>
-          requires:
-            - workspace-fmt
-          matrix:
-            parameters:
-              framework: ["web-actix-web", "web-axum", "web-rocket", "web-poem", "web-thruster", "web-tide", "web-tower","web-warp", "web-salvo", "bot-serenity"]
-      - check-standalone:
-          matrix:
-            parameters:
-              path:
-                - resources/aws-rds
-                - resources/persist
-                - resources/secrets
-                - resources/shared-db
-                - resources/static-folder
-      - service-test:
-          requires:
-            - workspace-clippy
-      - platform-test:
-          requires:
-            - workspace-clippy
-          matrix:
-            parameters:
-              crate: ["shuttle-deployer", "cargo-shuttle", "shuttle-codegen", "shuttle-common", "shuttle-proto", "shuttle-provisioner"]
-      - e2e-test:
-          requires:
-            - service-test
-            - platform-test
-            - check-standalone
-          filters:
-            branches:
-              only: production
-      - build-and-push:
-          requires:
-            - e2e-test
+       - workspace-fmt
+       - workspace-clippy:
+           name: workspace-clippy-<< matrix.framework >>
+           requires:
+             - workspace-fmt
+           matrix:
+             parameters:
+               framework: ["web-actix-web", "web-axum", "web-rocket", "web-poem", "web-thruster", "web-tide", "web-tower","web-warp", "web-salvo", "bot-serenity"]
+       - check-standalone:
+           matrix:
+             parameters:
+               path:
+                 - resources/aws-rds
+                 - resources/persist
+                 - resources/secrets
+                 - resources/shared-db
+                 - resources/static-folder
+       - service-test:
+           requires:
+             - workspace-clippy
+       - platform-test:
+           requires:
+             - workspace-clippy
+           matrix:
+             parameters:
+               crate: ["shuttle-deployer", "cargo-shuttle", "shuttle-codegen", "shuttle-common", "shuttle-proto", "shuttle-provisioner"]
+       - e2e-test:
+           requires:
+             - service-test
+             - platform-test
+             - check-standalone
+           filters:
+             branches:
+               only: production
+       - build-and-push:
+           requires:
+             - e2e-test
+           filters:
+             branches:
+               only: production
+       - build-binaries-linux:
+           name: build-binaries-x86_64
+           image: ubuntu-2204:2022.04.1
+           target: x86_64-unknown-linux-musl
+           resource_class: medium
+           filters:
+             branches:
+               only: production
+       - build-binaries-linux:
+           name: build-binaries-aarch64
+           image: ubuntu-2004:202101-01
+           target: aarch64-unknown-linux-musl
+           resource_class: arm.medium
+           filters:
+             branches:
+               only: production
+       - build-binaries-windows:
           filters:
             branches:
               only: production
-      - build-binaries-linux:
-          name: build-binaries-x86_64
-          image: ubuntu-2204:2022.04.1
-          target: x86_64-unknown-linux-musl
-          resource_class: medium
+       - build-binaries-mac:
           filters:
-            tags:
-              only: /^v.*/
             branches:
-              only: production
-      - build-binaries-linux:
-          name: build-binaries-aarch64
-          image: ubuntu-2004:202101-01
-          target: aarch64-unknown-linux-musl
-          resource_class: arm.medium
-          filters:
-            tags:
-              only: /^v.*/
-            branches:
-              only: production
-      - build-binaries-windows:
-          filters:
-            tags:
-              only: /^v.*/
-            branches:
-              only: production
-      - build-binaries-mac:
-          filters:
-            tags:
-              only: /^v.*/
-            branches:
-              only: production
-      - publish-github-release:
+             only: production
+       - publish-github-release:
           requires:
             - build-binaries-x86_64
             - build-binaries-aarch64
             - build-binaries-windows
             - build-binaries-mac
           filters:
-            tags:
-              only: /^v.*/
             branches:
-              only: production
+             only: production