Skip to content

Commit

Permalink
Fix upload prebuilds in Travis CI (#215)
Browse files Browse the repository at this point in the history
* Fix node-pre-gyp-github mismatch

* Fix .travis.yml and remove env

* Remove appveyor in favor of travis windows

* Add windows build

* Fix windows build
  • Loading branch information
hoangvvo authored and ranisalt committed Oct 27, 2019
1 parent 3000e22 commit 44494cd
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 63 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,22 @@ node_js:
os:
- linux
- osx
- windows
addons:
apt:
packages:
- lcov
cache: yarn
env:
global:
secure: i6L5GfsdUNmkn+qJVhXhPq7hOkiwotb4xHQccYApLZlgyOCpdAXMAkU18GuGBc5g7n2hXdAdTP1HUXogtIxUBcN/RkwqHiH25IPpEov9FWXTjgtE3MhEgqv2rCvxyLFnCkiJVoOCPo423BKUArVgwNc6069W6l++Yd1tWFVW8jcE4YHPo3s84cj73sKCJ/OtUVl8RDQypEmsm8s7kkwOzNUYpWw9C8vu8fLOgxwpk+P+48Zr0+GsM3lin2WQYgJtbuISU5Xfe4ykYxidK4pQAJHX5PjXF3DvAPVSjx5hJKjYMFA0ZfOsql2ez5oNVqE2HLSpvfoWDx/uDzo79l4XwOXbFR8igu1R/qjGQfvqQ/s9OFWK1gF9t/y32kLyg0VGW1zcnatuVePqkTXUadgeiwXfiwyO4p4c2rTVCVGYJ4FO6hAB+Uz5r9beGQ1QaQl8zw06SerE5uHSS7Cil0pi7zdh/xYuW8WEuxxDOGXB/VpUMLLe4ifdxNCzMpdV963EorNSdccWd/9+qH8BRSYabXwwxsnhkwNPA1x/K9+Q3iCdATsc9NBcAe4Mj+r/FPKtY1VZzlXbzZK2YZBEtaf7Hltq0xy+B5nHtEk2cjiMGODiF/dQX4Lku4PScf3a9RFTL3/i7g2KWfdUsqZZzX1+h42VOr6SvbLUt7SEu5WCwy4=
- YARN_GPG=no
matrix:
- npm_config_debug=yes
- npm_config_debug=yes
before_script: yarn lint
after_success:
- nyc report --reporter=text-lcov > lcov-js.info
- lcov -c -d . --no-external -o lcov-cpp.info
- lcov -r lcov-cpp.info "*/node_modules/*" -o lcov-cpp.info
- lcov -a lcov-cpp.info -a lcov-js.info | coveralls
- yarn test:ts
- if [[ "$TRAVIS_TAG" =~ '^v[0-9]+\.[0-9]+\.[0-9]+$' ]]; then npx node-pre-gyp package; npx node-pre-gyp-github publish; fi
- if [[ $TRAVIS_TAG =~ ^v[0-9]+\.[0-9]+\.[0-9]+ ]]; then echo "Publishing..."; npx node-pre-gyp package; npx node-pre-gyp-github publish; echo "Done publishing!"; fi;
59 changes: 0 additions & 59 deletions appveyor.yml

This file was deleted.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/ranisalt/node-argon2.git"
"url": "https://github.com/ranisalt/node-argon2.git"
},
"keywords": [
"argon2",
Expand Down
2 changes: 2 additions & 0 deletions src/argon2_node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#include <napi.h>
#include "../argon2/include/argon2.h"

#include <ciso646>

using namespace Napi;

#ifndef _MSC_VER
Expand Down

0 comments on commit 44494cd

Please sign in to comment.