Skip to content

Commit

Permalink
Merge branch 'release/1.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
anthony-malkoun committed May 7, 2019
2 parents a10e3ee + f8133b7 commit 6cb9eef
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 24 deletions.
30 changes: 22 additions & 8 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,17 @@
# This file may be left as is to assume default values specified in .ahoy.yml.

# Project name.
# Defaults to the name of the current directory with stripped hyphens and
# underscores.
# Defaults to the name of the current directory.
# PROJECT_NAME=mysite

# Docker Compose project name.
# All containers will have this prefix.
# Defaults to $PROJECT_NAME
# COMPOSE_PROJECT_NAME=mysite

# Drupal module prefix for site-specific modules.
# DRUPAL_MODULE_PREFIX=mysite

# Path to the root of the project inside of the container.
# APP=/app

Expand All @@ -27,11 +34,6 @@
# Defaults to http://<CURRENTDIR>.docker.amazee.io
# LOCALDEV_URL=http://mysite.docker.amazee.io

# Docker Compose project name.
# All containers will have this prefix.
# Defaults to $PROJECT_NAME
# COMPOSE_PROJECT_NAME=mysite

# Database connection details.
# MYSQL_HOST=mariadb
# MYSQL_PORT=3306
Expand All @@ -40,9 +42,21 @@
COMPOSER=composer.build.json

# Uncomment this for site build and set the profile name.
DRUPAL_PROFILE=tide
# DRUPAL_PROFILE=

# Uncomment to run the build in suggest mode.
# In this mode, modules from "suggested" part of composer.json will be
# installed.
# INSTALL_SUGGEST=1

# Uncomment to install brand new site.
INSTALL_NEW_SITE=1

# Uncomment to refresh search API on deployment.
# DRUPAL_REFRESH_SEARCHAPI=1

# Uncomment and add comma-separated list of targets (no spaces).
# PHPCS_TARGETS="src,tests"

# Uncomment below if Bay integration is enabled.
# BAY_INTEGRATION_ENABLED=1
22 changes: 11 additions & 11 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
"type": "drupal-profile",
"license": "GPL-2.0-or-later",
"require": {
"dpc-sdp/tide_api": "^1.0",
"dpc-sdp/tide_core": "^1.0",
"dpc-sdp/tide_event": "^1.0",
"dpc-sdp/tide_landing_page": "^1.0",
"dpc-sdp/tide_media": "^1.0",
"dpc-sdp/tide_monsido": "^1.0",
"dpc-sdp/tide_news": "^1.0",
"dpc-sdp/tide_page": "^1.0",
"dpc-sdp/tide_search": "^1.0",
"dpc-sdp/tide_site": "^1.0",
"dpc-sdp/tide_api": "1.2.0",
"dpc-sdp/tide_core": "1.1.0",
"dpc-sdp/tide_event": "1.2.0",
"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_test": "^1.0",
"dpc-sdp/tide_webform": "^1.0"
"dpc-sdp/tide_webform": "1.1.0"
},
"repositories": {
"drupal": {
Expand Down
2 changes: 1 addition & 1 deletion dev-init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@

# Development only: uncomment and set the commit value to fetch Dev Tools at
# specific commit.
#export GH_COMMIT=COMMIT_SHA
export GH_COMMIT=e7c3b83e650e69b16aa5ba6db2c21f7ad3257769

curl https://raw.githubusercontent.com/dpc-sdp/dev-tools/master/install | bash
8 changes: 4 additions & 4 deletions tide.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ type: profile
package: Tide
core: '8.x'
dependencies:
- dpc-sdp:tide_api
- dpc-sdp:tide_core
- dpc-sdp:tide_event
- dpc-sdp:tide_landing_page
- dpc-sdp:tide_api
- dpc-sdp:tide_media
- dpc-sdp:tide_webform
- dpc-sdp:tide_event
- dpc-sdp:tide_news
- dpc-sdp:tide_page
- dpc-sdp:tide_landing_page
- dpc-sdp:tide_search
- dpc-sdp:tide_site
- dpc-sdp:tide_site_simple_sitemap
- dpc-sdp:tide_webform
themes:
- seven

0 comments on commit 6cb9eef

Please sign in to comment.