Merge pull request #841 from blackflux/dev

[Gally]: master <- dev
blackflux · Sep 15, 2019 · 47b7ad6 · 47b7ad6
2 parents 101f0c4 + c565e19
commit 47b7ad6
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 29 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -9,7 +9,7 @@ workflows:
       - test-node-v10:
           requires:
             - gally-create-pr
-      - gally-auto-merge:
+      - gally-auto-approve:
           requires:
             - gally-create-pr
             - test-node-v12
@@ -66,28 +66,6 @@ jobs:
       - run: >-
           (git add . && git diff-index --quiet HEAD --) || (git status && exit
           1);
-  gally-auto-merge:
-    docker:
-      - image: 'circleci/node:12'
-    steps:
-      - run:
-          name: Set PR number
-          command: >
-            echo 'export
-            CIRCLE_PR_NUMBER="${CIRCLE_PR_NUMBER:-${CIRCLE_PULL_REQUEST##*/}}"'
-            >> $BASH_ENV
-
-            source $BASH_ENV
-
-            echo $CIRCLE_PR_NUMBER
-      - checkout
-      - run: sudo yarn global add gally
-      - run: >-
-          ga approve $CIRCLE_PR_NUMBER --condition
-          "base.ref=dev&state=open&user.login=dependabot-preview[bot]&mergeable=true"
-      - run: >-
-          ga merge $CIRCLE_PR_NUMBER --condition
-          "base.ref=dev&state=open&user.login=dependabot-preview[bot]&mergeable=true"
   release:
     docker:
       - image: 'circleci/node:12'
@@ -154,3 +132,22 @@ jobs:
             if [[ "${CIRCLE_BRANCH}" == "master" ]]; then
               yarn run coveralls
             fi
+  gally-auto-approve:
+    docker:
+      - image: 'circleci/node:12'
+    steps:
+      - run:
+          name: Set PR number
+          command: >
+            echo 'export
+            CIRCLE_PR_NUMBER="${CIRCLE_PR_NUMBER:-${CIRCLE_PULL_REQUEST##*/}}"'
+            >> $BASH_ENV
+
+            source $BASH_ENV
+
+            echo $CIRCLE_PR_NUMBER
+      - checkout
+      - run: sudo yarn global add gally
+      - run: >-
+          ga approve $CIRCLE_PR_NUMBER --condition
+          "base.ref=dev&state=open&user.login=dependabot-preview[bot]"
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     "@babel/plugin-proposal-object-rest-spread": "7.5.5",
     "@babel/register": "7.6.0",
     "@blackflux/eslint-plugin-rules": "1.3.12",
-    "@blackflux/robo-config-plugin": "2.6.7",
+    "@blackflux/robo-config-plugin": "2.6.8",
     "babel-eslint": "10.0.3",
     "chai": "4.2.0",
     "coveralls": "3.0.6",
@@ -106,7 +106,7 @@
     "chalk": "2.4.2",
     "fancy-log": "1.3.3",
     "glob": "7.1.4",
-    "joi-strict": "1.1.2",
+    "joi-strict": "1.1.3",
     "js-yaml": "3.13.1",
     "lodash.difference": "4.5.0",
     "lodash.get": "4.4.2",

diff --git a/yarn.lock b/yarn.lock
@@ -174,10 +174,10 @@
   dependencies:
     smart-fs "1.9.14"
 
-"@blackflux/robo-config-plugin@2.6.7":
-  version "2.6.7"
-  resolved "https://registry.yarnpkg.com/@blackflux/robo-config-plugin/-/robo-config-plugin-2.6.7.tgz#ab04180917713c7deeeaf4ce5ba4489d709666ba"
-  integrity sha512-MZ9kcShTjL/dfuo2qWaibHLbGC62YKqvIQq9D6EMV7JWie1TNk0ddOnYP9XlMx1X3tFRX85p+xasIr8nNtjI6Q==
+"@blackflux/robo-config-plugin@2.6.8":
+  version "2.6.8"
+  resolved "https://registry.yarnpkg.com/@blackflux/robo-config-plugin/-/robo-config-plugin-2.6.8.tgz#58bd672fa76bd9221e1d3c1bb13bc51fd73485e9"
+  integrity sha512-CqXGjFEua9lOYzLYVVEGR0e3PYxxBFnCNWKqRLORg66lA1Sw4sKhSGfD+hUMm/ugdr+bUo9T2GyUI+OPqP19vA==
 
 "@hapi/address@2.x.x":
   version "2.1.1"
@@ -3566,6 +3566,13 @@ joi-strict@1.1.2:
   dependencies:
     "@hapi/joi" "16.0.1"
 
+joi-strict@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/joi-strict/-/joi-strict-1.1.3.tgz#7ffd4c722826d3082f67d3f51f21cd445635c5f7"
+  integrity sha512-xHfMrEb/C6tYWWz6c+oZA0Ch4fWJ7gV5JierV+9tsaUbJAIzxNIhOJUSf1S9AP9TWm4TmD2oIllaxPfldqg0VA==
+  dependencies:
+    "@hapi/joi" "16.0.1"
+
 js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"