From 4c693f8b59c2d85fac0e0266ab706ebebef2d94d Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Mon, 12 Nov 2018 14:46:12 -0800 Subject: [PATCH] chore: run CircleCI for 7.0.x --- .circleci/config.yml | 1 + package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 169877199372..9bb0443a3548 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -318,6 +318,7 @@ general: branches: only: - master + - 7.0.x # 5.2.x, 6.0.x, etc - /\d+\.\d+\.x/ # 5.x, 6.x, etc diff --git a/package.json b/package.json index 611536f0053f..968e56a16806 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,7 @@ "highlight.js": "^9.11.0", "http-rewrite-middleware": "^0.1.6", "inquirer": "^6.2.0", - "jasmine-core": "^3.2.0", + "jasmine-core": "~3.2.0", "karma": "^3.0.0", "karma-browserstack-launcher": "^1.3.0", "karma-chrome-launcher": "^2.2.0", diff --git a/yarn.lock b/yarn.lock index 157327203465..877e0e7bf509 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6367,10 +6367,10 @@ jasmine-core@2.8.0, jasmine-core@~2.8.0: resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e" integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4= -jasmine-core@^3.2.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.3.0.tgz#dea1cdc634bc93c7e0d4ad27185df30fa971b10e" - integrity sha512-3/xSmG/d35hf80BEN66Y6g9Ca5l/Isdeg/j6zvbTYlTzeKinzmaTM4p9am5kYqOmE05D7s1t8FGjzdSnbUbceA== +jasmine-core@~3.2.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.2.1.tgz#8e4ff5b861603ee83343f2b49eee6a0ffe9650ce" + integrity sha512-pa9tbBWgU0EE4SWgc85T4sa886ufuQdsgruQANhECYjwqgV4z7Vw/499aCaP8ZH79JDS4vhm8doDG9HO4+e4sA== jasmine-diff@^0.1.3: version "0.1.3"