Skip to content
Open
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
1 change: 1 addition & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"presets": [
"es2015",
"flow",
"react",
"stage-0"
]
Expand Down
20 changes: 11 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# CircleCI 2.0 configuration file. See <https://circleci.com/docs/2.0/language-python/>.
version: 2
version: 2.1

jobs:
build:
parallelism: 4
docker:
- image: circleci/node:10-browsers
- image: circleci/node:10-browsers
environment:
WATAI_TESTS: tests/integration
SAUCE_USERNAME: openfisca
Expand All @@ -17,7 +17,7 @@ jobs:
- restore_cache:
key: dependency-cache-{{ checksum "package.json" }}
- restore_cache:
key: sc-4.6.4
key: sc-4.8.2
- run:
name: Install app dependencies
command: npm install
Expand All @@ -27,14 +27,14 @@ jobs:
npm install saucelabs@^1.5.0 --no-save # allow sending Watai results to SauceLabs. Don't save in package.json, as this would change its checksum and mess up the cache.
if [ -d sc ]; then exit; fi # sc has already been downloaded
mkdir sc
wget https://saucelabs.com/downloads/sc-4.6.4-linux.tar.gz --directory-prefix sc
tar -xzf sc/sc-4.6.4-linux.tar.gz --directory sc
wget https://saucelabs.com/downloads/sc-4.8.2-linux.tar.gz --directory-prefix sc
tar -xzf sc/sc-4.8.2-linux.tar.gz --directory sc
- save_cache:
key: dependency-cache-{{ checksum "package.json" }}
paths:
- node_modules
- save_cache:
key: sc-4.6.4
key: sc-4.8.2
paths:
- sc
- run:
Expand All @@ -49,7 +49,7 @@ jobs:
background: true
- run:
name: Start Sauce Connect
command: cd sc/sc-*-linux && ./bin/sc --user $SAUCE_USERNAME --api-key $SAUCE_ACCESS_KEY --tunnel-identifier "circle-$CIRCLE_BUILD_NUM-$CIRCLE_NODE_INDEX" --readyfile ~/sauce_is_ready > /tmp/sauce_log.txt
command: cd sc/sc-*-linux && ./bin/sc --user $SAUCE_USERNAME --api-key $SAUCE_ACCESS_KEY --tunnel-name "circle-$CIRCLE_BUILD_NUM-$CIRCLE_NODE_INDEX" --readyfile ~/sauce_is_ready > /tmp/sauce_log.txt
background: true
- run:
name: Wait for Sauce Connect
Expand All @@ -69,15 +69,17 @@ jobs:
- store_artifacts:
path: /tmp/sauce_log.txt
destination: sauce-log

deploy:
docker:
- image: circleci/node:8-jessie-browsers

steps:
- run:
name: Deploy app
command: if [ -n "$DEPLOY_SSH" ]; then ssh -o StrictHostKeyChecking=no $DEPLOY_SSH; fi

workflows:
version: 2
build:
jobs:
- build
Expand Down
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
flow-typed
public
tests
10 changes: 9 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,13 @@
"plugins": [
"react"
],
"extends": ["eslint:recommended", "plugin:react/recommended"]
"extends": [
"eslint:recommended",
"plugin:react/recommended"
],
"settings": {
"react": {
"version": "detect"
}
}
}
11 changes: 11 additions & 0 deletions .flowconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[ignore]
<PROJECT_ROOT>/.*
!<PROJECT_ROOT>/src/utils/client.js
!<PROJECT_ROOT>/src/utils/periods.ts
!<PROJECT_ROOT>/src/utils/search.js

[libs]
flow-typed

[options]
all=true
24 changes: 7 additions & 17 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,22 +1,12 @@
# Build
public
webpack-assets.json

# Do not store config. See more at https://12factor.net/config.
.DS_Store
.env
.env.*

# NPM
.idea
.project
.vscode
flow-typed
node_modules
npm-debug.log

# Ops

ops/.vagrant

# IDEs
.vscode
.project

# OS
.DS_Store
public
webpack-assets.json
Loading