Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switching to yarn to manage node.js modules #1188

Merged
merged 3 commits into from
Apr 16, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ install:

# Build js and css assets
- php artisan lang:generate
- npm install
- npm run production
- yarn install
- yarn run production

before_script:
- php artisan migrate --env=testing --no-interaction -vvv
Expand Down Expand Up @@ -82,6 +82,7 @@ after_script:
- if [[ "$COVERAGE" == "1" ]]; then scripts/tests/travis-sonar.sh; fi

cache:
yarn: true
directories:
- $HOME/.composer/cache/files
- node_modules
Expand Down Expand Up @@ -121,8 +122,8 @@ jobs:
- travis_retry composer install --no-interaction --no-suggest --ignore-platform-reqs --no-dev
# Build js and css assets
- php artisan lang:generate
- npm install
- npm run production
- yarn install
- yarn run production

before_script: skip

Expand Down
Binary file modified .travis.yml.sig
Binary file not shown.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@ build: build-dev
build-prod:
composer install --no-interaction --no-suggest --ignore-platform-reqs --no-dev
php artisan lang:generate
npm install
npm run production
yarn install
yarn run production

build-dev:
composer install --no-interaction --no-suggest --ignore-platform-reqs
php artisan lang:generate
npm install
npm run dev
yarn install
yarn run dev

prepare: $(DESTDIR) $(ASSETS)
mkdir -p results
Expand Down
Loading