Skip to content

Commit

Permalink
Merge 01a84cc into b6ece26
Browse files Browse the repository at this point in the history
  • Loading branch information
greg-1-anderson committed Sep 12, 2019
2 parents b6ece26 + 01a84cc commit 5567e22
Show file tree
Hide file tree
Showing 112 changed files with 1,808 additions and 865 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Expand Up @@ -5,5 +5,4 @@ site/
robotheme/
tests/_log/*
tests/_helpers/_generated/*
composer.phar
robo.phar
*.phar
14 changes: 9 additions & 5 deletions .scenarios.lock/install
Expand Up @@ -4,16 +4,16 @@ SCENARIO=$1
DEPENDENCIES=${2-install}

# Convert the aliases 'highest', 'lowest' and 'lock' to
# the corresponding composer command to run.
# the corresponding composer update command to run.
case $DEPENDENCIES in
highest)
DEPENDENCIES=update
UPDATE_COMMAND=update
;;
lowest)
DEPENDENCIES='update --prefer-lowest'
UPDATE_COMMAND='update --prefer-lowest'
;;
lock|default|"")
DEPENDENCIES=install
UPDATE_COMMAND=''
;;
esac

Expand Down Expand Up @@ -48,7 +48,11 @@ echo
set -ex

composer -n validate --working-dir=$dir --no-check-all --ansi
composer -n --working-dir=$dir ${DEPENDENCIES} --prefer-dist --no-scripts

if [ ! -z "$UPDATE_COMMAND" ] ; then
composer -n --working-dir=$dir ${UPDATE_COMMAND} --prefer-dist --no-scripts
fi
composer -n --working-dir=$dir install --prefer-dist

# If called from a CI context, print out some extra information about
# what we just installed.
Expand Down
6 changes: 3 additions & 3 deletions .scenarios.lock/symfony3/composer.json
Expand Up @@ -26,7 +26,7 @@
"symfony/console": "^3",
"php": ">=7",
"consolidation/annotated-command": "^2.11.0",
"consolidation/config": "^1.0.10",
"consolidation/config": "^1.2",
"consolidation/log": "^1.1.1",
"consolidation/output-formatters": "^3.1.13",
"consolidation/self-update": "^1",
Expand All @@ -40,7 +40,7 @@
"require-dev": {
"g1a/composer-test-scenarios": "^3",
"patchwork/jsqueeze": "^2",
"natxet/CssMin": "3.0.4",
"natxet/cssmin": "3.0.4",
"pear/archive_tar": "^1.4.4",
"codeception/base": "^2.3.7",
"goaop/framework": "~2.1.2",
Expand Down Expand Up @@ -82,7 +82,7 @@
"pear/archive_tar": "Allows tar archives to be created and extracted in taskPack and taskExtract, respectively.",
"henrikbjorn/lurker": "For monitoring filesystem changes in taskWatch",
"patchwork/jsqueeze": "For minifying JS files in taskMinify",
"natxet/CssMin": "For minifying CSS files in taskMinify"
"natxet/cssmin": "For minifying CSS files in taskMinify"
},
"replace": {
"codegyre/robo": "< 1.0"
Expand Down

0 comments on commit 5567e22

Please sign in to comment.