From a8e615cecf0d18f214df59fbc38bbc4aefe99706 Mon Sep 17 00:00:00 2001 From: Guy Owen Date: Wed, 15 May 2019 06:54:59 +1000 Subject: [PATCH 1/4] [SDPA-2522] Updated Tide packages to latest. --- composer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index a0f26bf..07f6a8a 100644 --- a/composer.json +++ b/composer.json @@ -4,18 +4,18 @@ "type": "drupal-profile", "license": "GPL-2.0-or-later", "require": { - "dpc-sdp/tide_api": "1.2.1", + "dpc-sdp/tide_api": "1.2.2", "dpc-sdp/tide_core": "1.2.0", - "dpc-sdp/tide_event": "1.2.1", - "dpc-sdp/tide_landing_page": "1.1.1", + "dpc-sdp/tide_event": "1.2.2", + "dpc-sdp/tide_landing_page": "1.1.2", "dpc-sdp/tide_media": "1.2.1", "dpc-sdp/tide_monsido": "1.1.1", - "dpc-sdp/tide_news": "1.1.1", - "dpc-sdp/tide_page": "1.2.1", + "dpc-sdp/tide_news": "1.1.2", + "dpc-sdp/tide_page": "1.2.2", "dpc-sdp/tide_search": "1.1.1", - "dpc-sdp/tide_site": "1.1.1", + "dpc-sdp/tide_site": "1.1.2", "dpc-sdp/tide_test": "^1.0", - "dpc-sdp/tide_webform": "1.1.1" + "dpc-sdp/tide_webform": "1.1.2" }, "repositories": { "drupal": { From f439b806db5fde4d0861e47d56a0601cdcd6a7d1 Mon Sep 17 00:00:00 2001 From: Guy Owen Date: Wed, 15 May 2019 07:50:55 +1000 Subject: [PATCH 2/4] [SDPA-2522] Updated constraints. --- composer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 07f6a8a..226c8e8 100644 --- a/composer.json +++ b/composer.json @@ -4,18 +4,18 @@ "type": "drupal-profile", "license": "GPL-2.0-or-later", "require": { - "dpc-sdp/tide_api": "1.2.2", + "dpc-sdp/tide_api": "dev-hotfix/1.2.2", "dpc-sdp/tide_core": "1.2.0", - "dpc-sdp/tide_event": "1.2.2", - "dpc-sdp/tide_landing_page": "1.1.2", + "dpc-sdp/tide_event": "dev-hotfix/1.2.2", + "dpc-sdp/tide_landing_page": "dev-hotfix/1.1.2", "dpc-sdp/tide_media": "1.2.1", "dpc-sdp/tide_monsido": "1.1.1", - "dpc-sdp/tide_news": "1.1.2", - "dpc-sdp/tide_page": "1.2.2", + "dpc-sdp/tide_news": "dev-hotfix/1.1.2", + "dpc-sdp/tide_page": "dev-hotfix/1.2.2", "dpc-sdp/tide_search": "1.1.1", - "dpc-sdp/tide_site": "1.1.2", + "dpc-sdp/tide_site": "dev-hotfix/1.1.2", "dpc-sdp/tide_test": "^1.0", - "dpc-sdp/tide_webform": "1.1.2" + "dpc-sdp/tide_webform": "dev-hotfix/1.1.2" }, "repositories": { "drupal": { From 0e6dc27c44fb5071d01d705da0ceceb27f272e46 Mon Sep 17 00:00:00 2001 From: Guy Owen Date: Wed, 15 May 2019 08:44:59 +1000 Subject: [PATCH 3/4] [SDPA-2522] Fixed CI dev-tools script execution. Update tide_search constraint. --- .circleci/config.yml | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3c1167d..eff62f9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,7 +13,7 @@ aliases: at: /workspace - checkout # Init environment for development. - - run: if [ -f "./dev-init.sh" ] && [ ! "$DEV_TOOLS" ]; then ./dev-init.sh; fi + - run: if [ -f "./dev-tools.sh" ] && [ ! "$DEV_TOOLS" ]; then ./dev-tools.sh; fi - setup_remote_docker: docker_layer_caching: true - run: .circleci/build.sh diff --git a/composer.json b/composer.json index 226c8e8..d0b7b5e 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "dpc-sdp/tide_monsido": "1.1.1", "dpc-sdp/tide_news": "dev-hotfix/1.1.2", "dpc-sdp/tide_page": "dev-hotfix/1.2.2", - "dpc-sdp/tide_search": "1.1.1", + "dpc-sdp/tide_search": "dev-hotfix/1.1.2", "dpc-sdp/tide_site": "dev-hotfix/1.1.2", "dpc-sdp/tide_test": "^1.0", "dpc-sdp/tide_webform": "dev-hotfix/1.1.2" From acde067f4f88d65926e40afe67006dc85a8af602 Mon Sep 17 00:00:00 2001 From: Guy Owen Date: Wed, 15 May 2019 09:56:05 +1000 Subject: [PATCH 4/4] [SDPA-2522] Updated Tide version constraints. --- composer.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index d0b7b5e..ed33ea1 100644 --- a/composer.json +++ b/composer.json @@ -4,18 +4,18 @@ "type": "drupal-profile", "license": "GPL-2.0-or-later", "require": { - "dpc-sdp/tide_api": "dev-hotfix/1.2.2", - "dpc-sdp/tide_core": "1.2.0", - "dpc-sdp/tide_event": "dev-hotfix/1.2.2", - "dpc-sdp/tide_landing_page": "dev-hotfix/1.1.2", + "dpc-sdp/tide_api": "1.2.3", + "dpc-sdp/tide_core": "1.2.1", + "dpc-sdp/tide_event": "1.2.2", + "dpc-sdp/tide_landing_page": "1.1.2", "dpc-sdp/tide_media": "1.2.1", "dpc-sdp/tide_monsido": "1.1.1", - "dpc-sdp/tide_news": "dev-hotfix/1.1.2", - "dpc-sdp/tide_page": "dev-hotfix/1.2.2", - "dpc-sdp/tide_search": "dev-hotfix/1.1.2", - "dpc-sdp/tide_site": "dev-hotfix/1.1.2", + "dpc-sdp/tide_news": "1.1.2", + "dpc-sdp/tide_page": "1.2.2", + "dpc-sdp/tide_search": "1.1.2", + "dpc-sdp/tide_site": "1.1.2", "dpc-sdp/tide_test": "^1.0", - "dpc-sdp/tide_webform": "dev-hotfix/1.1.2" + "dpc-sdp/tide_webform": "1.1.2" }, "repositories": { "drupal": {