diff --git a/.travis.yml b/.travis.yml index 22c0ce3311..c63bfa1109 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,52 +11,43 @@ matrix: - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder - os: linux dist: trusty - services: docker language: generic - install: - - sudo snap install core addons: - apt: - sources: - - sourceline: ppa:snappy-dev/tools - packages: - - libgnome-keyring-dev - - graphicsmagick - - icnsutils - - snapd - - snapcraft ssh_known_hosts: - the-front-end.de - frs.sourceforge.net -#cache: -# directories: -# - node_modules -# - $HOME/.cache/electron -# - $HOME/.cache/electron-builder +cache: + directories: + - node_modules + - $HOME/.cache/electron + - $HOME/.cache/electron-builder before_script: - - 'npm install -g bower' + - 'npm install -g bower gulp --quiet' - 'bower install' script: -# - 'npm install && npm run pub' - | if [ "$TRAVIS_OS_NAME" == "linux" ]; then + echo '____RUNNING DOCKER____' docker run --rm \ --env-file <(env | grep -iE 'DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS|APPVEYOR_|CSC_|_TOKEN|_KEY|AWS_|STRIP|BUILD_') \ -v ${PWD}:/project \ -v ~/.cache/electron:/root/.cache/electron \ -v ~/.cache/electron-builder:/root/.cache/electron-builder \ electronuserland/builder:wine \ - /bin/bash -c "npm install && npm rebuild && npm run pub" + /bin/bash -c "echo '____DOCKER_INNER_START____' && ls -l && yarn global add bower gulp && yarn --link-duplicates --pure-lockfile && yarn release --linux --win && ls -l ./dist" else - npm install && npm run pub + npm install --quiet && npm run pub fi after_script: + - 'echo "DIST-RESULT:"' + - 'ls -l ./dist' + - 'echo "UPLOADING BINARIES:"' - 'rename "s/[0-9]+\.[0-9]+\.[0-9]+/latest/" ./dist/superproductivity*' - 'rename "s/\s+/_/g" ./dist/superProductivity*' - 'rename "s/[0-9]+\.[0-9]+\.[0-9]+/latest/" ./dist/superproductivity*' diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000..b434602225 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2017 Johannes Millan + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/package.json b/package.json index 67768e69ce..16b5706f3c 100644 --- a/package.json +++ b/package.json @@ -14,11 +14,11 @@ "test": "echo \"Error: no test specified\" && exit 1", "start": "NODE_ENV=DEV electron ./electron/main.js", "pack": "electron-builder --dir", - "pack-win": "electron-builder --dir --win", "localInstall": "sudo echo 'Starting local install' && rm -Rf ./dist/ && gulp build && build && sudo dpkg -i dist/superProductivity*.deb", "dist": "gulp build && electron-builder", "dist-win": "electron-builder --win", "pub": "gulp build && electron-builder -p always", + "release": "gulp build && electron-builder", "pub-win": "electron-builder -p always -w ", "minorRelease": "npm version minor && git push --tags && git push && git checkout master && git merge develop && git push && git checkout develop && copy ./deploy.sh", "patchRelease": "npm version patch && git push --tags && git push && git checkout master && git merge develop && git push && git checkout develop && ./deploy.sh" @@ -52,9 +52,7 @@ "category": "Utility", "target": [ "AppImage", - "deb", - "snap", - "rpm" + "deb" ], "publish": [ "github"