From 9e1c1e8dbf4817f411f718c75ce42493d92c43b6 Mon Sep 17 00:00:00 2001
From: Abhishek Aggarwal <66322306+abhi-agg@users.noreply.github.com>
Date: Tue, 21 Dec 2021 23:58:13 +0100
Subject: [PATCH] CI: Circle CI config script update (#287)

- Robust artifact presence check
 - Variable name refactoring
 - Storing only those artifacts that are required
 - Remove commit sha from the names of the Github Releases
 - Use BERGAMOT_VERSION file contents for Git Tag names
---
 .circleci/config.yml | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d9ff793..fbea34e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -19,13 +19,12 @@ jobs:
           name: Check artifacts
           working_directory: build-wasm
           command: |
-            ls -all bergamot*
-            if ls bergamot*.wasm &>/dev/null && ls bergamot*.js &>/dev/null
-            then
+            ARTIFACT_BASE="bergamot-translator-worker"
+            if [[ -f "$ARTIFACT_BASE.js" && -f "$ARTIFACT_BASE.wasm" ]]; then
               echo "Artifacts Successfully Generated"
               mkdir ../artifacts
-              cp bergamot-translator-worker.wasm ../artifacts/bergamot-translator-worker-with-wormhole.wasm
-              cp bergamot-translator-worker.js ../artifacts/bergamot-translator-worker-with-wormhole.js
+              cp $ARTIFACT_BASE.wasm ../artifacts/$ARTIFACT_BASE-with-wormhole.wasm
+              cp $ARTIFACT_BASE.js ../artifacts/$ARTIFACT_BASE-with-wormhole.js
               shasum -a 256 ../artifacts/* > ../artifacts/SHA256-1
               cp ../BERGAMOT_VERSION ../artifacts/
             else
@@ -39,7 +38,7 @@ jobs:
             - artifacts/*
 
       - store_artifacts:
-          path: "build-wasm"
+          path: "artifacts"
           destination: "wasm-wormhole"
 
   build-without-wormhole:
@@ -61,26 +60,27 @@ jobs:
           name: Check artifacts
           working_directory: build-wasm
           command: |
-            ls -all bergamot*
-            if ls bergamot*.wasm &>/dev/null && ls bergamot*.js &>/dev/null
-            then
+            ARTIFACT_BASE="bergamot-translator-worker"
+            if [[ -f "$ARTIFACT_BASE.js" && -f "$ARTIFACT_BASE.wasm" ]]; then
               echo "Artifacts Successfully Generated"
               mkdir ../artifacts
-              cp bergamot-translator-worker.wasm ../artifacts/bergamot-translator-worker-without-wormhole.wasm
-              cp bergamot-translator-worker.js ../artifacts/bergamot-translator-worker-without-wormhole.js
+              cp $ARTIFACT_BASE.wasm ../artifacts/$ARTIFACT_BASE-without-wormhole.wasm
+              cp $ARTIFACT_BASE.js ../artifacts/$ARTIFACT_BASE-without-wormhole.js
               shasum -a 256 ../artifacts/* > ../artifacts/SHA256-2
             else
               echo "Failure: Artifacts Not Present"
               exit 1
             fi
+
       - persist_to_workspace:
           root: .
           paths:
             - artifacts/*
 
       - store_artifacts:
-          path: "build-wasm"
+          path: "artifacts"
           destination: "wasm-without-wormhole"
+
   publish_to_github:
      docker:
        - image: cibuilds/github:0.10
@@ -91,15 +91,11 @@ jobs:
        - run:
           name: "Publish Release on GitHub"
           command: |
-            export COMMIT=$(echo $CIRCLE_SHA1 | cut -c -7)
-            export VERSION=$(cat ./artifacts/BERGAMOT_VERSION | cut -c 2-)
-            VERSION=$VERSION+$COMMIT
+            export TAG_VERSION=$(cat ./artifacts/BERGAMOT_VERSION)
             ls -lsa ./artifacts/ > ./artifacts/FILESIZES
             cat ./artifacts/SHA256-1 ./artifacts/SHA256-2 > ./artifacts/SHA256
-            rm ./artifacts/SHA256-1
-            rm ./artifacts/SHA256-2
-            rm ./artifacts/BERGAMOT_VERSION
-            ghr -t ${GHTOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${VERSION} ./artifacts/
+            rm ./artifacts/SHA256-1 ./artifacts/SHA256-2 ./artifacts/BERGAMOT_VERSION
+            ghr -t ${GHTOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${TAG_VERSION} ./artifacts/
 
 workflows:
   build: