From bcd886077550030d13e2c8ebfe9685a8710839cb Mon Sep 17 00:00:00 2001 From: Anthony Malkoun Date: Thu, 9 May 2019 18:10:37 +1000 Subject: [PATCH 1/5] Update Drupal to 8.6.16 --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 448edca..29bb75d 100644 --- a/composer.json +++ b/composer.json @@ -5,8 +5,8 @@ "license": "GPL-2.0-or-later", "require": { "dpc-sdp/tide_api": "1.2.0", - "dpc-sdp/tide_core": "1.1.0", - "dpc-sdp/tide_event": "1.2.0", + "dpc-sdp/tide_core": "hotfix/1.2.0", + "dpc-sdp/tide_event": "hotfix/1.2.1", "dpc-sdp/tide_landing_page": "1.1.0", "dpc-sdp/tide_media": "1.2.0", "dpc-sdp/tide_monsido": "1.1.0", From ee0849eb457163e45d96f3a29efec4caa86be8d8 Mon Sep 17 00:00:00 2001 From: Anthony Malkoun Date: Thu, 9 May 2019 18:13:58 +1000 Subject: [PATCH 2/5] Fix wrong dev version constraints --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 29bb75d..1274fc6 100644 --- a/composer.json +++ b/composer.json @@ -5,8 +5,8 @@ "license": "GPL-2.0-or-later", "require": { "dpc-sdp/tide_api": "1.2.0", - "dpc-sdp/tide_core": "hotfix/1.2.0", - "dpc-sdp/tide_event": "hotfix/1.2.1", + "dpc-sdp/tide_core": "dev-hotfix/1.2.0", + "dpc-sdp/tide_event": "dev-hotfix/1.2.1", "dpc-sdp/tide_landing_page": "1.1.0", "dpc-sdp/tide_media": "1.2.0", "dpc-sdp/tide_monsido": "1.1.0", From 8b0ae1e88780ad24d80a1f5a4fba1196e9d66cff Mon Sep 17 00:00:00 2001 From: Guy Owen Date: Mon, 13 May 2019 11:26:58 +1000 Subject: [PATCH 3/5] [SDPA-2522] Updated tide_* version contraints. --- composer.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 1274fc6..cd98ea1 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.0", + "dpc-sdp/tide_api": "dev-hotfix/1.2.1", "dpc-sdp/tide_core": "dev-hotfix/1.2.0", "dpc-sdp/tide_event": "dev-hotfix/1.2.1", - "dpc-sdp/tide_landing_page": "1.1.0", - "dpc-sdp/tide_media": "1.2.0", - "dpc-sdp/tide_monsido": "1.1.0", - "dpc-sdp/tide_news": "1.1.0", - "dpc-sdp/tide_page": "1.2.0", - "dpc-sdp/tide_search": "1.1.0", - "dpc-sdp/tide_site": "1.1.0", + "dpc-sdp/tide_landing_page": "dev-hotfix/1.1.1", + "dpc-sdp/tide_media": "dev-hotfix/1.2.1", + "dpc-sdp/tide_monsido": "dev-hotfix/1.1.1", + "dpc-sdp/tide_news": "dev-hotfix/1.1.1", + "dpc-sdp/tide_page": "dev-hotfix/1.2.1", + "dpc-sdp/tide_search": "dev-hotfix/1.1.1", + "dpc-sdp/tide_site": "dev-hotfix/1.1.1", "dpc-sdp/tide_test": "^1.0", - "dpc-sdp/tide_webform": "1.1.0" + "dpc-sdp/tide_webform": "dev-hotfix/1.1.1" }, "repositories": { "drupal": { From 02ea71104a5cbb448a0ae3f986a12b878932fb77 Mon Sep 17 00:00:00 2001 From: Guy Owen Date: Tue, 14 May 2019 16:29:50 +1000 Subject: [PATCH 4/5] [SDPA-2522] Updated Tide packages to latest release. --- composer.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index cd98ea1..a0f26bf 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.1", - "dpc-sdp/tide_core": "dev-hotfix/1.2.0", - "dpc-sdp/tide_event": "dev-hotfix/1.2.1", - "dpc-sdp/tide_landing_page": "dev-hotfix/1.1.1", - "dpc-sdp/tide_media": "dev-hotfix/1.2.1", - "dpc-sdp/tide_monsido": "dev-hotfix/1.1.1", - "dpc-sdp/tide_news": "dev-hotfix/1.1.1", - "dpc-sdp/tide_page": "dev-hotfix/1.2.1", - "dpc-sdp/tide_search": "dev-hotfix/1.1.1", - "dpc-sdp/tide_site": "dev-hotfix/1.1.1", + "dpc-sdp/tide_api": "1.2.1", + "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_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_search": "1.1.1", + "dpc-sdp/tide_site": "1.1.1", "dpc-sdp/tide_test": "^1.0", - "dpc-sdp/tide_webform": "dev-hotfix/1.1.1" + "dpc-sdp/tide_webform": "1.1.1" }, "repositories": { "drupal": { From 9e7a76f81483a0dba1f19da5054ee39f757a7af6 Mon Sep 17 00:00:00 2001 From: Guy Owen Date: Tue, 14 May 2019 16:38:53 +1000 Subject: [PATCH 5/5] [SDPA-2522] Updated dev-tools script. --- dev-init.sh | 21 --------------------- dev-tools.sh | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 21 deletions(-) delete mode 100755 dev-init.sh create mode 100755 dev-tools.sh diff --git a/dev-init.sh b/dev-init.sh deleted file mode 100755 index fd4ad99..0000000 --- a/dev-init.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash -## -# Install development files from the centralised location. -# -# Files already committed within current repository will not be overridden. -## -# To override any files coming from Dev Tools to persist in the current -# repository, modify `.git/info/exclude` file and commit them. -# -# Usage: -# . dev-init.sh -# -# To update all files, including committed: -# ALLOW_OVERRIDE=1 . dev-init.sh -# - -# Development only: uncomment and set the commit value to fetch Dev Tools at -# specific commit. -export GH_COMMIT=e7c3b83e650e69b16aa5ba6db2c21f7ad3257769 - -curl https://raw.githubusercontent.com/dpc-sdp/dev-tools/master/install | bash diff --git a/dev-tools.sh b/dev-tools.sh new file mode 100755 index 0000000..d7573df --- /dev/null +++ b/dev-tools.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash +## +# Install development files from the centralised location - Dev-Tools repository. +# +# === WHAT IS DEV-TOOLS === +# Dev-Tools is a development environment for Drupal sites with tools included. +# https://github.com/dpc-sdp/dev-tools +# +# === WHAT IS THIS FILE AND WHY DO I NEED IT === +# Using Dev-Tools requires initial installation into your project. Once +# installed, it the can be "attached" in every environment were development +# stack is required. This means that your project will have only small number +# of Dev-Tools files committed - the rest of the files will be downloaded each +# time Dev-Tools needs to be "attached". +# +# This file is a script to download Dev-Tools at the latest stable version and +# "attach" it to the current environment. +# Files already committed within current repository will not be overridden. +# +# Usage: +# ./dev-tools.sh +# +# === HOW TO OVERRIDE LOCALLY EXCLUDED FILES === +# To override any files coming from Dev-Tools to persist in the current +# repository, modify `.git/info/exclude` file and commit them. +# +# === HOW TO UPDATE DEV-TOOLS === +# ALLOW_OVERRIDE=1 ./dev-tools.sh +# +# === HOW TO PIN TO SPECIFIC DEV-TOOLS COMMIT === +# For development of Dev-Tools or debugging of the development stack, it may be +# required to point to the specific Dev-Tools's commit rather then use the latest +# stable version. +# +# Uncomment and set the Dev-Tools's commit value and commit this change. +# export GH_COMMIT=COMMIT_SHA + +bash <(curl -L https://raw.githubusercontent.com/dpc-sdp/dev-tools/master/install?"$(date +%s)") "$@"