Skip to content

Commit

Permalink
Merge pull request #154 from Cryptonomic/develop
Browse files Browse the repository at this point in the history
Merging develop into master for closed alpha testing
  • Loading branch information
umurb authored Apr 23, 2019
2 parents 504bd66 + 6c5ea84 commit 5842f60
Show file tree
Hide file tree
Showing 155 changed files with 8,436 additions and 26,623 deletions.
Binary file removed .DS_Store
Binary file not shown.
37 changes: 37 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"presets": [
[
"env",
{
"targets": { "node": 10 },
"useBuiltIns": true
}
],
"stage-0",
"react"
],
"plugins": [
"add-module-exports",
"babel-plugin-styled-components",
"polished"
],
"env": {
"production": {
"presets": ["react-optimize"],
"plugins": ["dev-expression"]
},
"development": {
"plugins": [
"transform-class-properties",
"transform-es2015-classes",
[
"flow-runtime",
{
"assert": true,
"annotate": true
}
]
]
}
}
}
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,8 @@ typings/

# TSC
dist
build
build
src/config.tsx

# OSX
.DS_Store
71 changes: 57 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,60 @@
language: node_js
node_js:
- "stable"
sudo: true
matrix:
include:
- os: osx
osx_image: xcode9.4
language: node_js
node_js:
- 8
- os: linux
services: docker
language: node_js
node_js:
- 8
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- libudev-dev
- g++-4.8
- icnsutils
- graphicsmagick
- xz-utils
- xorriso
- rpm
- g++-4.8-multilib
- gcc-multilib
- libusb-1.0-0-dev

cache:
yarn: true
directories:
- node_modules
- node_modules

install:
- npm install
# On Linux, initialize "virtual display". See before_script
- |
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
/sbin/start-stop-daemon \
--start \
--quiet \
--pidfile /tmp/custom_xvfb_99.pid \
--make-pidfile \
--background \
--exec /usr/bin/Xvfb \
-- :99 -ac -screen 0 1280x1024x16
else
:
fi
before_script:
# On Linux, create a "virtual display". This allows browsers to work properly
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export DISPLAY=:99.0; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sh -e /etc/init.d/xvfb start; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sleep 3; fi

script:
- npm run lint
- npm test
- npm run build
deploy:
provider: pages
skip_cleanup: true
github_token: $githubToken
local_dir: build
on:
branch: master
- node --version
- npm run build
24 changes: 0 additions & 24 deletions config-overrides.js

This file was deleted.

17 changes: 0 additions & 17 deletions index.html

This file was deleted.

Loading

0 comments on commit 5842f60

Please sign in to comment.