diff --git a/.gitignore b/.gitignore index cd14591..5b0a998 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# Release keys +Release.key + # sea-floor .sea diff --git a/.travis.yml b/.travis.yml index 9062069..65a9cf4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,42 @@ +osx_image: xcode8.3 + +dist: trusty + language: node_js node_js: - "8" + +env: + global: + - ELECTRON_CACHE=$HOME/.cache/electron + - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder + +os: + - linux + - osx + script: - - yarn - - yarn lint - - yarn test + - npm install + - npm run test cache: directories: - node_modules + - $HOME/.cache/electron + - $HOME/.cache/electron-builder + - $HOME/.npm/_prebuilds + +install: + - npm install + +script: + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then npm run release; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then npm run release -- --mac --win; fi + +before_cache: + - rm -rf $HOME/.cache/electron-builder/wine + +branches: + except: + - "/^v\\d+\\.\\d+\\.\\d+$/" + after_script: "cat ./coverage/lcov.info | ./node_modules/.bin/coveralls" \ No newline at end of file diff --git a/package.json b/package.json index a2b734c..1fd7033 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Aurora", - "version": "0.0.0", + "version": "0.0.1", "license": "MIT", "scripts": { "dev": "electron-webpack dev", @@ -8,7 +8,7 @@ "compile": "electron-webpack", "update-snapshot-tests": "./node_modules/.bin/jest --updateSnapshot", "test": "cross-env NODE_ENV=test ./node_modules/.bin/jest", - "dist": "yarn compile && electron-builder", + "dist": "yarn compile && electron-builder --prepackaged dist", "dist:dir": "yarn dist --dir -c.compression=store -c.mac.identity=null", "db-down": "node node_modules/db-migrate/bin/db-migrate down --config config/database.json", "db-up": "node node_modules/db-migrate/bin/db-migrate up --config config/database.json", @@ -19,7 +19,8 @@ "add-many-notes": "cross-env NODE_ENV=development babel-node scripts/convert-notes/convert.js scripts/convert-notes/our_large_dataset.json", "create-note": "cross-env NODE_ENV=development babel-node scripts/create-note/create.js", "lint": "./node_modules/.bin/eslint src", - "postinstall": "electron-builder install-app-deps" + "postinstall": "electron-builder install-app-deps", + "release": "yarn compile && electron-builder --publish always" }, "dependencies": { "@react-mutate/core": "^0.6.0",