Skip to content

Commit

Permalink
Merge branch 'release/1.2.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
TravisCarden committed Jan 2, 2020
2 parents 933197e + 5193818 commit 949577d
Show file tree
Hide file tree
Showing 9 changed files with 279 additions and 265 deletions.
2 changes: 1 addition & 1 deletion bin/pipelines/packages_alter.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
acquia/lightning:
type: drupal-profile
version: ~3.0
version: ~4.0

# Let Lightning manage its own components.
drupal/lightning_api: ~
Expand Down
4 changes: 3 additions & 1 deletion bin/travis/after_script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@
cd "$(dirname "$0")" || exit; source _includes.sh

# Log the job on cron if telemetry is enabled.
if [[ "$TRAVIS_EVENT_TYPE" = "cron" && "$ORCA_TELEMETRY_ENABLE" && "$ORCA_AMPLITUDE_API_KEY" && "$ORCA_AMPLITUDE_USER_ID" ]]; then
if [[ "$TRAVIS_EVENT_TYPE" = "cron" && "$ORCA_TELEMETRY_ENABLE" = "TRUE" && "$ORCA_AMPLITUDE_API_KEY" && "$ORCA_AMPLITUDE_USER_ID" ]]; then
orca internal:log-job
fi
if [[ "$ORCA_TELEMETRY_ENABLE" = "TRUE" ]]; then
orca internal:log-job --simulate
fi

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
"behat/behat": "^3.5",
"composer/composer": "^1.7",
"dealerdirect/phpcodesniffer-composer-installer": "^0.5",
"ergebnis/composer-normalize": "^2.0.0",
"hassankhan/config": "^2.1",
"jakub-onderka/php-console-highlighter": "^0.4.0",
"jakub-onderka/php-parallel-lint": "^1.0",
"localheinz/composer-normalize": "^1.2",
"mockery/mockery": "^1.2",
"myclabs/php-enum": "^1.7",
"oscarotero/env": "^1.2",
Expand Down
Loading

0 comments on commit 949577d

Please sign in to comment.