Skip to content

Commit

Permalink
Merge pull request #154 from palantirnet/drupal-check-followup
Browse files Browse the repository at this point in the history
Drupal check followup - fix the-build's CI tests
  • Loading branch information
becw authored May 18, 2020
2 parents add72bf + 2e8e2be commit 52c42f0
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 10 deletions.
33 changes: 23 additions & 10 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,20 @@ jobs:
name: Configure URL in /etc/hosts
command: echo 127.0.0.1 ${CIRCLE_PROJECT_REPONAME}.local | sudo tee -a /etc/hosts

# Note: phing and drupal-check have mutually exclusive requirements.
# It'd be better to add drupal-check as a dependency of the drupal project
# rather than as part of the virtual environment, but this will have to do
# for now. Also note, drupal-check is added as part of the-vagrant so it
# is available to run within our VM.
# Note 2: drupal-check is pinned to a known stable version.
- run:
name: Install drupal-check
command: |
curl -O -L https://github.com/mglaman/drupal-check/releases/download/1.0.9/drupal-check.phar
mkdir --parents ~/bin
mv drupal-check.phar ~/bin/drupal-check
chmod +x ~/bin/drupal-check
# Composer package cache
- restore_cache:
keys:
Expand Down Expand Up @@ -76,16 +90,6 @@ jobs:
paths:
- ".git"


# Composer package cache - update when the contents of the Composer cache directory
# change
- run: ls -1R ~/.composer/cache/ > /tmp/composer-cache.txt
- save_cache:
key: composer-v1-{{ checksum "/tmp/composer-cache.txt" }}
paths:
- ~/.composer


# Install the-build
- run:
name: Install the-build in the project
Expand All @@ -101,6 +105,15 @@ jobs:
name: Install Drupal
command: printf 'y' | vendor/bin/phing install -Ddrupal.validate_clean_config.bypass=yes

# Composer package cache - update when the contents of the Composer cache directory
# change. This cache is saved after installing Drupal, as the install process uses
# composer to add a few modules.
- run: ls -1R ~/.composer/cache/ > /tmp/composer-cache.txt
- save_cache:
key: composer-v1-{{ checksum "/tmp/composer-cache.txt" }}
paths:
- ~/.composer

# Add a multisite
- run:
name: Add a multisite to the project
Expand Down
1 change: 1 addition & 0 deletions defaults/install/.circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ jobs:
# rather than as part of the virtual environment, but this will have to do
# for now. Also note, drupal-check is added as part of the-vagrant so it
# is available to run within our VM.
# Note 2: drupal-check is pinned to a known stable version.
- run:
name: Install drupal-check
command: |
Expand Down

0 comments on commit 52c42f0

Please sign in to comment.