Save artifacts to folder versioning-log

onimur · Jul 18, 2020 · 6b16980 · 6b16980
1 parent 22fa32c
commit 6b16980
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/src/commands/git-checkout.yml b/src/commands/git-checkout.yml
@@ -13,5 +13,6 @@ steps:
       command: |
         if [ -n "$CIRCLE_TAG" ]
         then
+          git reset --hard "$CIRCLE_SHA1"
           git checkout -q -B "<<parameters.branch>>"
         fi
diff --git a/src/commands/git-push.yml b/src/commands/git-push.yml
@@ -51,7 +51,7 @@ steps:
   - run:
       command: |
         if [ -z "${CIRCLE_TAG+x}" ]; then
-          if [[ "$(git show -s --format=%B | head -n 1)" == "<<parameters.commit-message>>" ]]; then
+          if [[ "$(git show -s --format=%B | head -n 1)" == "<<parameters.commit-message>>  [skip ci]" ]]; then
               circleci-agent step halt
           fi
         fi

diff --git a/src/jobs/changelog-custom.yml b/src/jobs/changelog-custom.yml
@@ -407,13 +407,13 @@ steps:
       requires: [changelog]
       steps:
         - run:
-            name: Save <<parameters.output>> to artifacts
+            name: Save <<parameters.output>> to versioning-log
             command: |
-              mkdir -p artifacts
-              find -iname '<<parameters.output>>' -exec cp {} ./artifacts/ \;
+              mkdir -p versioning-log
+              find -iname '<<parameters.output>>' -exec cp {} ./versioning-log/ \;
         - store_artifacts:
-            path: artifacts
+            path: versioning-log
         - persist_to_workspace:
             root: ./
             paths:
-              - artifacts/*
+              - versioning-log/*
diff --git a/src/jobs/changelog-default.yml b/src/jobs/changelog-default.yml
@@ -81,13 +81,13 @@ steps:
       requires: [changelog]
       steps:
         - run:
-            name: Save changelog to artifacts
+            name: Save changelog to versioning-log
             command: |
-              mkdir -p artifacts
-              find -iname 'CHANGELOG.md' -exec cp {} ./artifacts/ \;
+              mkdir -p versioning-log
+              find -iname 'CHANGELOG.md' -exec cp {} ./versioning-log/ \;
         - store_artifacts:
-            path: artifacts
+            path: versioning-log
         - persist_to_workspace:
             root: ./
             paths:
-              - artifacts/*
+              - versioning-log/*