From bf481b76d1a64cf2da53e6d858b389b8c59549bb Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Tue, 7 Jan 2020 16:38:54 +0100 Subject: [PATCH] Rewrite bash script in bb --- .circleci/config.yml | 4 ++-- .circleci/script/publish_artifact | 5 ----- .circleci/script/publish_artifact.clj | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+), 7 deletions(-) delete mode 100755 .circleci/script/publish_artifact create mode 100755 .circleci/script/publish_artifact.clj diff --git a/.circleci/config.yml b/.circleci/config.yml index 49f267e8..c30939cd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -135,7 +135,7 @@ jobs: - run: name: Publish artifact link to Slack command: | - .circleci/script/publish_artifact + ./bb .circleci/script/publish_artifact mac: macos: xcode: "9.0" @@ -203,7 +203,7 @@ jobs: - run: name: Publish artifact link to Slack command: | - .circleci/script/publish_artifact + ./bb .circleci/script/publish_artifact deploy: docker: - image: circleci/clojure:lein-2.8.1 diff --git a/.circleci/script/publish_artifact b/.circleci/script/publish_artifact deleted file mode 100755 index d5931a50..00000000 --- a/.circleci/script/publish_artifact +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -channel="#babashka_circleci_builds" -text="[$BABASHKA_PLATFORM - $CIRCLE_BRANCH@$CIRCLE_SHA1]: https://$CIRCLE_BUILD_NUM-201467090-gh.circle-artifacts.com/0/release/babashka-0.0.61-SNAPSHOT-$BABASHKA_PLATFORM-amd64.zip" -curl -X POST -H "Content-Type: application/json" -d '{"username":"borkdude", "channel":'\""$channel\""', "text":'"\"$text\""'}' $SLACK_HOOK_URL diff --git a/.circleci/script/publish_artifact.clj b/.circleci/script/publish_artifact.clj new file mode 100755 index 00000000..cb55f321 --- /dev/null +++ b/.circleci/script/publish_artifact.clj @@ -0,0 +1,19 @@ +(require '[clojure.java.shell :refer [sh]] + '[cheshire.core :refer [generate-string]]) + +(def channel "#babashka_circleci_builds") +#_(def channel "#_test") + +(def text (format "[%s - %s@%s]: https://%s-201467090-gh.circle-artifacts.com/0/release/babashka-0.0.61-SNAPSHOT-%s-amd64.zip" + (System/getenv "BABASHKA_PLATFORM") + (System/getenv "CIRCLE_BRANCH") + (System/getenv "CIRCLE_SHA1") + (System/getenv "CIRCLE_BUILD_NUM") + (System/getenv "BABASHKA_PLATFORM"))) + +(def slack-hook-url (System/getenv "SLACK_HOOK_URL")) +(when slack-hook-url + (let [json (generate-string {:username "borkdude" + :channel channel + :text text})] + (sh "curl" "-X" "POST" "-H" "Content-Type: application/json" "-d" json slack-hook-url)))