Merge pull request #156 from StackStorm/bump-version-in-npm-shrinkwrap

Bump version in npm-shrinkwrap.json
StackStorm · Jul 30, 2020 · b06af88 · b06af88
2 parents 9420a48 + 37760f8
commit b06af88
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -21,8 +21,12 @@ jobs:
     - run:
         name: Get repos and dependencies
         command: |
-          git clone --depth 1 ${ST2_PACKAGES_REPO} ~/st2-packages
-          git clone --depth 1 ${ST2_TEST_ENVIRONMENT} ~/st2-docker
+          echo "Cloning ${ST2_PACKAGES_BRANCH:-master} branch of st2-packages"
+          git clone --branch ${ST2_PACKAGES_BRANCH:-master} --depth 1 ${ST2_PACKAGES_REPO} ~/st2-packages
+          # Use DEPRECATED/all-in-one for now, we'll have to circle back around
+          # and fix this to use the master branch
+          echo "Cloning ${ST2_DOCKER_BRANCH:-DEPRECATED/all-in-one} branch of st2-docker"
+          git clone --branch ${ST2_DOCKER_BRANCH:-DEPRECATED/all-in-one} --depth 1 ${ST2_TEST_ENVIRONMENT} ~/st2-docker
           make -C ~/st2-docker env
           sudo apt-get update -qq && sudo apt-get install -y rpm jq
           gem install package_cloud

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json