Skip to content
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 6 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
.DS_Store
.idea
.node-xmlhttprequest-sync-*
.tern-port
.vscode
@embark*.tgz
NOTES
TODO
dist
embark-*.tgz
embark*.tgz
lerna-debug.log
node_modules
npm-debug.log*
npm-shrinkwrap.json
package
package-lock.json
yarn-debug.log*
yarn-error.log*
coverage
.nyc_output
yarn.lock
!/yarn.lock
37 changes: 25 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,31 @@ os:
node_js:
- "8"
- "10"
cache: yarn
before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.12.3
- export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
cache:
yarn: true
env:
- EMBARK_NO_PREPARE=true
- |
echo installing IPFS
IPFS_VER=0.4.18
pushd "$PWD" &>/dev/null
mkdir -p ~/Downloads && cd ~/Downloads
if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then
URL="https://dist.ipfs.io/go-ipfs/v${IPFS_VER}/go-ipfs_v${IPFS_VER}_linux-amd64.tar.gz"
fi
if [[ "$TRAVIS_OS_NAME" = "osx" ]]; then
URL="https://dist.ipfs.io/go-ipfs/v${IPFS_VER}/go-ipfs_v${IPFS_VER}_darwin-amd64.tar.gz"
fi
curl -O -L "$URL" && unset IPFS_VER URL
tar xzvf go-ipfs* && export PATH="$PWD/go-ipfs:$PATH"
popd &>/dev/null
ipfs init
- |
echo installing Yarn
YARN_VER="1.12.3"
curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version "$YARN_VER"
unset YARN_VER
export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
- yarn --version
install:
- yarn install
- cd embark-ui && yarn install && cd ..
- npm run check-working-tree
- echo embark installation managed by package.json script 'ci'
script:
- npm run build:node
- npm test
- npm run check-working-tree
- npm run ci
1 change: 1 addition & 0 deletions .yarnrc
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
--*.scripts-prepend-node-path true
--install.check-files true
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Before you submit your Pull Request (PR) consider the following guidelines:
```

1. Create your patch, **including appropriate test cases**.
1. Run the test suite, by running `$ npm run fulltest` and ensure that all tests pass.
1. Run the QA suite, by running `$ npm run qa` and ensure that all steps succeed.
1. Commit your changes using a descriptive commit message that follows our
[commit message conventions](#commit). Adherence to these conventions
is necessary because release notes are automatically generated from these messages.
Expand Down
30 changes: 20 additions & 10 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,32 @@ environment:
matrix:
- nodejs_version: "8"
- nodejs_version: "10"
EMBARK_NO_PREPARE: true
cache:
- "%LOCALAPPDATA%\\Yarn"
install:
- ps: Install-Product node $env:nodejs_version
- ps: Start-FileDownload 'https://github.com/yarnpkg/yarn/releases/download/v1.12.3/yarn-1.12.3.msi'
- cmd /c start /wait msiexec.exe /i yarn-1.12.3.msi /quiet /qn /norestart
- rm yarn-1.12.3.msi
- node --version
- npm --version
- ps: |
"installing IPFS"
$IPFS_VER="0.4.18"
pushd
mkdir C:\Downloads | out-null; cd C:\Downloads
Start-FileDownload "https://dist.ipfs.io/go-ipfs/v$($IPFS_VER)/go-ipfs_v$($IPFS_VER)_windows-amd64.zip"
7z x .\go-ipfs*
Remove-Variable IPFS_VER
$ENV:PATH="C:\Downloads\go-ipfs;$ENV:PATH"
popd
ipfs init
- ps: |
"installing Yarn"
$YARN_VER="1.12.3"
Start-FileDownload "https://github.com/yarnpkg/yarn/releases/download/v$($YARN_VER)/yarn-$($YARN_VER).msi"
cmd /c start /wait msiexec.exe /i "yarn-$($YARN_VER).msi" /quiet /qn /norestart
rm "yarn-$($YARN_VER).msi"
Remove-Variable YARN_VER
- yarn --version
- yarn install
- cd embark-ui && yarn install && cd ..
- npm run check-working-tree
- echo embark installation managed by package.json script 'ci'
test_script:
- npm run build:node
- npm test
- npm run check-working-tree
- npm run ci
build: off
25 changes: 0 additions & 25 deletions embark-ui/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion embark-ui/.yarnrc

This file was deleted.

Loading