From b08c3173e0d6a8c5e705675092ef8f9d8bba9206 Mon Sep 17 00:00:00 2001 From: "brian.gaeddert" Date: Wed, 29 Jul 2020 07:30:29 -0600 Subject: [PATCH 1/5] Updated lodash 4.17.12 to 4.17.19 --- apps/st2-actions/package.json | 2 +- apps/st2-code/package.json | 2 +- apps/st2-history/package.json | 2 +- apps/st2-inquiry/package.json | 2 +- apps/st2-packs/package.json | 2 +- apps/st2-rules/package.json | 2 +- apps/st2-triggers/package.json | 2 +- modules/st2-api/package.json | 2 +- modules/st2-auto-form/package.json | 2 +- modules/st2-criteria/package.json | 2 +- modules/st2-filter-expandable/package.json | 2 +- modules/st2-flex-table/package.json | 2 +- modules/st2-forms/package.json | 2 +- modules/st2-menu/package.json | 2 +- modules/st2-portion-bar/package.json | 2 +- modules/st2-proportional/package.json | 2 +- modules/st2-router/package.json | 2 +- package.json | 2 +- tasks/package.json | 2 +- yarn.lock | 8 ++++---- 20 files changed, 23 insertions(+), 23 deletions(-) diff --git a/apps/st2-actions/package.json b/apps/st2-actions/package.json index 072c9f7f6..e95b8b298 100644 --- a/apps/st2-actions/package.json +++ b/apps/st2-actions/package.json @@ -63,7 +63,7 @@ "@stackstorm/module-time": "^2.4.3", "@stackstorm/module-title": "^2.4.3", "@stackstorm/module-view": "^2.4.3", - "lodash": "4.17.12", + "lodash": "4.17.19", "prop-types": "15.7.2", "react": "16.8.6", "react-dom": "16.8.6", diff --git a/apps/st2-code/package.json b/apps/st2-code/package.json index b98b240a8..b0d62f29a 100644 --- a/apps/st2-code/package.json +++ b/apps/st2-code/package.json @@ -52,7 +52,7 @@ "@stackstorm/module-store": "^2.4.3", "@stackstorm/module-flex-table": "^2.4.3", "@stackstorm/module-api": "^2.4.3", - "lodash": "4.17.12", + "lodash": "4.17.19", "react": "16.8.6", "react-dom": "16.8.6", "react-redux": "7.0.2", diff --git a/apps/st2-history/package.json b/apps/st2-history/package.json index 9f50dfbe5..67f7bc5f0 100644 --- a/apps/st2-history/package.json +++ b/apps/st2-history/package.json @@ -65,7 +65,7 @@ "@stackstorm/module-time": "^2.4.3", "@stackstorm/module-title": "^2.4.3", "@stackstorm/module-view": "^2.4.3", - "lodash": "4.17.12", + "lodash": "4.17.19", "prop-types": "15.7.2", "react": "16.8.6", "react-dom": "16.8.6", diff --git a/apps/st2-inquiry/package.json b/apps/st2-inquiry/package.json index 8f4ebe24f..0c84b1c8e 100644 --- a/apps/st2-inquiry/package.json +++ b/apps/st2-inquiry/package.json @@ -58,7 +58,7 @@ "@stackstorm/module-router": "^2.4.3", "@stackstorm/module-store": "^2.4.3", "@stackstorm/module-title": "^2.4.3", - "lodash": "4.17.12", + "lodash": "4.17.19", "prop-types": "15.7.2", "react": "16.8.6", "react-dom": "16.8.6", diff --git a/apps/st2-packs/package.json b/apps/st2-packs/package.json index 24516b78a..73a168560 100644 --- a/apps/st2-packs/package.json +++ b/apps/st2-packs/package.json @@ -57,7 +57,7 @@ "@stackstorm/module-router": "^2.4.3", "@stackstorm/module-store": "^2.4.3", "@stackstorm/module-title": "^2.4.3", - "lodash": "4.17.12", + "lodash": "4.17.19", "prop-types": "15.7.2", "react": "16.8.6", "react-dom": "16.8.6", diff --git a/apps/st2-rules/package.json b/apps/st2-rules/package.json index ff66027ff..475f0f5fa 100644 --- a/apps/st2-rules/package.json +++ b/apps/st2-rules/package.json @@ -62,7 +62,7 @@ "@stackstorm/module-store": "^2.4.3", "@stackstorm/module-time": "^2.4.3", "@stackstorm/module-title": "^2.4.3", - "lodash": "4.17.12", + "lodash": "4.17.19", "prop-types": "15.7.2", "react": "16.8.6", "react-dom": "16.8.6", diff --git a/apps/st2-triggers/package.json b/apps/st2-triggers/package.json index 68f21ffe4..2f0e08edc 100644 --- a/apps/st2-triggers/package.json +++ b/apps/st2-triggers/package.json @@ -58,7 +58,7 @@ "@stackstorm/module-store": "^2.4.3", "@stackstorm/module-time": "^2.4.3", "@stackstorm/module-title": "^2.4.3", - "lodash": "4.17.12", + "lodash": "4.17.19", "prop-types": "15.7.2", "react": "16.8.6", "react-dom": "16.8.6", diff --git a/modules/st2-api/package.json b/modules/st2-api/package.json index 5b8df6186..f4e9514b0 100644 --- a/modules/st2-api/package.json +++ b/modules/st2-api/package.json @@ -27,7 +27,7 @@ "access": "public" }, "dependencies": { - "lodash": "4.17.12", + "lodash": "4.17.19", "react": "16.8.6", "react-dom": "16.8.6", "axios": "^0.18.0", diff --git a/modules/st2-auto-form/package.json b/modules/st2-auto-form/package.json index 15adaf31b..89a7c6a0a 100644 --- a/modules/st2-auto-form/package.json +++ b/modules/st2-auto-form/package.json @@ -52,7 +52,7 @@ }, "dependencies": { "@stackstorm/module-value-format": "^2.4.3", - "lodash": "4.17.12", + "lodash": "4.17.19", "prop-types": "15.7.2", "react": "16.8.6", "react-dom": "16.8.6", diff --git a/modules/st2-criteria/package.json b/modules/st2-criteria/package.json index 605ed856d..c6382531e 100644 --- a/modules/st2-criteria/package.json +++ b/modules/st2-criteria/package.json @@ -54,7 +54,7 @@ }, "dependencies": { "@stackstorm/module-auto-form": "^2.4.3", - "lodash": "4.17.12", + "lodash": "4.17.19", "prop-types": "15.7.2", "react": "16.8.6", "react-dom": "16.8.6", diff --git a/modules/st2-filter-expandable/package.json b/modules/st2-filter-expandable/package.json index 34119d8f1..aede92f52 100644 --- a/modules/st2-filter-expandable/package.json +++ b/modules/st2-filter-expandable/package.json @@ -27,7 +27,7 @@ "access": "public" }, "dependencies": { - "lodash": "4.17.12" + "lodash": "4.17.19" }, "devDependencies": { "@stackstorm/st2-style": "2.4.3", diff --git a/modules/st2-flex-table/package.json b/modules/st2-flex-table/package.json index 797469ad5..216967aae 100644 --- a/modules/st2-flex-table/package.json +++ b/modules/st2-flex-table/package.json @@ -78,7 +78,7 @@ }, "dependencies": { "@stackstorm/module-store": "^2.4.3", - "lodash": "4.17.12", + "lodash": "4.17.19", "prop-types": "15.7.2", "react": "16.8.6", "react-dom": "16.8.6", diff --git a/modules/st2-forms/package.json b/modules/st2-forms/package.json index 6787a4e30..59a0151e7 100644 --- a/modules/st2-forms/package.json +++ b/modules/st2-forms/package.json @@ -77,7 +77,7 @@ "access": "public" }, "dependencies": { - "lodash": "4.17.12", + "lodash": "4.17.19", "prop-types": "15.7.2", "react": "16.8.6", "react-dom": "16.8.6", diff --git a/modules/st2-menu/package.json b/modules/st2-menu/package.json index 167a9d65c..914605e74 100644 --- a/modules/st2-menu/package.json +++ b/modules/st2-menu/package.json @@ -55,7 +55,7 @@ "dependencies": { "@stackstorm/module-api": "^2.4.3", "@stackstorm/module-router": "^2.4.3", - "lodash": "4.17.12", + "lodash": "4.17.19", "prop-types": "15.7.2", "react": "16.8.6", "react-dom": "16.8.6" diff --git a/modules/st2-portion-bar/package.json b/modules/st2-portion-bar/package.json index 54dda893d..1353a6744 100644 --- a/modules/st2-portion-bar/package.json +++ b/modules/st2-portion-bar/package.json @@ -53,7 +53,7 @@ "access": "public" }, "dependencies": { - "lodash": "4.17.12", + "lodash": "4.17.19", "prop-types": "15.7.2", "react": "16.8.6", "react-dom": "16.8.6", diff --git a/modules/st2-proportional/package.json b/modules/st2-proportional/package.json index 75f5bc8c5..1b5057863 100644 --- a/modules/st2-proportional/package.json +++ b/modules/st2-proportional/package.json @@ -27,7 +27,7 @@ "access": "public" }, "dependencies": { - "lodash": "4.17.12", + "lodash": "4.17.19", "react": "16.8.6", "react-dom": "16.8.6" }, diff --git a/modules/st2-router/package.json b/modules/st2-router/package.json index c0c2cbe98..4d07b3cda 100644 --- a/modules/st2-router/package.json +++ b/modules/st2-router/package.json @@ -31,7 +31,7 @@ "@stackstorm/module-store": "^2.4.3", "@stackstorm/module-api": "^2.4.3", "@stackstorm/module-login": "^2.4.3", - "lodash": "4.17.12", + "lodash": "4.17.19", "prop-types": "15.7.2", "react": "16.8.6", "react-dom": "16.8.6", diff --git a/package.json b/package.json index 8d7d57957..913caf55e 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "@stackstorm/module-store": "^2.4.3", "moment": "2.24.0", "urijs": "1.19.1", - "lodash": "4.17.12", + "lodash": "4.17.19", "react": "16.8.6", "react-dom": "16.8.6", "react-redux": "7.0.2", diff --git a/tasks/package.json b/tasks/package.json index ca61e43f1..4d2cbc446 100644 --- a/tasks/package.json +++ b/tasks/package.json @@ -60,7 +60,7 @@ "gulp-uglify-es": "1.0.4", "gulp-util": "3.0.8", "gulp-webserver": "0.9.1", - "lodash": "4.17.12", + "lodash": "4.17.19", "mocha": "6.1.4", "pathmodify": "0.5.0", "require-dir": "1.2.0", diff --git a/yarn.lock b/yarn.lock index fe6f2057e..97a1558d5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5342,10 +5342,10 @@ lodash.values@~2.4.1: dependencies: lodash.keys "~2.4.1" -lodash@4.17.12: - version "4.17.12" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.12.tgz#a712c74fdc31f7ecb20fe44f157d802d208097ef" - integrity sha512-+CiwtLnsJhX03p20mwXuvhoebatoh5B3tt+VvYlrPgZC1g36y+RRbkufX95Xa+X4I59aWEacDFYwnJZiyBh9gA== +lodash@4.17.19: + version "4.17.19" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b" + integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ== lodash@>=2.4.0, lodash@^4.17.11: version "4.17.11" From 1c46d01ef3afc745450215d6d68864d23f1ace9f Mon Sep 17 00:00:00 2001 From: "brian.gaeddert" Date: Thu, 30 Jul 2020 08:50:28 -0600 Subject: [PATCH 2/5] removed make from circleci --- .circleci/config.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 97a1e3572..d3ffc6595 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -72,12 +72,6 @@ jobs: - run: name: Clone test containers command: git clone --depth 1 https://github.com/StackStorm/st2-docker ~/st2-docker - - run: - name: Update env variables for test containers - command: | - make -C ~/st2-docker env - echo -e "ST2_USER=${ST2_USERNAME}\nST2_PASSWORD=${ST2_PASSWORD}" > ~/st2-docker/conf/stackstorm.env - cat ~/st2-docker/conf/stackstorm.env - run: name: Start test containers command: | From 9038dc8bbc3eff50531df273c040135d9682f0b3 Mon Sep 17 00:00:00 2001 From: "brian.gaeddert" Date: Thu, 30 Jul 2020 15:04:49 -0600 Subject: [PATCH 3/5] use deprecated st2-docker branch --- .circleci/config.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d3ffc6595..762609831 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -71,7 +71,13 @@ jobs: sudo chmod +x /usr/local/bin/docker-compose - run: name: Clone test containers - command: git clone --depth 1 https://github.com/StackStorm/st2-docker ~/st2-docker + command: git clone -b "DEPRECATED/all-in-one" --depth 1 https://github.com/StackStorm/st2-docker ~/st2-docker + - run: + name: Update env variables for test containers + command: | + make -C ~/st2-docker env + echo -e "ST2_USER=${ST2_USERNAME}\nST2_PASSWORD=${ST2_PASSWORD}" > ~/st2-docker/conf/stackstorm.env + cat ~/st2-docker/conf/stackstorm.env - run: name: Start test containers command: | From 05a8863be3bdce94732dff5034b97b9b00286bc7 Mon Sep 17 00:00:00 2001 From: "brian.gaeddert" Date: Fri, 31 Jul 2020 06:07:26 -0600 Subject: [PATCH 4/5] use deprecated st2-docker branch with env --- .circleci/config.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 762609831..ecccc3952 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,6 +15,8 @@ jobs: ST2_HOST: localhost ST2_USERNAME: admin ST2_PASSWORD: 123 + ST2_DOCKER_BRANCH: + ST2_TEST_ENVIRONMENT: https://github.com/StackStorm/st2-docker steps: - checkout - run: @@ -71,7 +73,11 @@ jobs: sudo chmod +x /usr/local/bin/docker-compose - run: name: Clone test containers - command: git clone -b "DEPRECATED/all-in-one" --depth 1 https://github.com/StackStorm/st2-docker ~/st2-docker + command: | + # 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 - run: name: Update env variables for test containers command: | From 9242b4cf4ca6fc2c1c34b12856499451dc644451 Mon Sep 17 00:00:00 2001 From: JP Bourget Date: Fri, 31 Jul 2020 11:03:50 -0400 Subject: [PATCH 5/5] remove blank ST2_DOCKER_BRANCH envvar --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ecccc3952..a8cd87582 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,7 +15,6 @@ jobs: ST2_HOST: localhost ST2_USERNAME: admin ST2_PASSWORD: 123 - ST2_DOCKER_BRANCH: ST2_TEST_ENVIRONMENT: https://github.com/StackStorm/st2-docker steps: - checkout