Skip to content

Commit 368e035

Browse files
authored
fix travis build (#33)
* fix travis build * 0.3.8 * 0.3.9 * update script and travis build
1 parent 751acba commit 368e035

File tree

4 files changed

+35
-22
lines changed

4 files changed

+35
-22
lines changed

.travis.yml

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,36 @@
11
language: node_js
22
node_js:
3-
- '9'
4-
- '8'
5-
- '7'
6-
3+
- '9'
4+
- '8'
5+
- '7'
76
install:
87
- npm install
9-
108
deploy:
119
- provider: script
1210
skip_cleanup: true
1311
script: sh .travis/pu.sh
1412
on:
15-
branch: master
1613
tags: false
17-
- provider: npm
18-
19-
api_key: $NPM_TOKEN
14+
node: 8
15+
repo: Azure-Samples/react-aad-msal
16+
# - provider: npm
17+
18+
# api_key:
19+
# secure: JGnaSdWwGa2Bh8kezygMsNz9vau3Z/T8SvgAtlnFZIu0mqBfZNjC0oJEM2FH26D73Nj4kb6BOSmZ3blhNeQCZw/KfNimwd4hDJY/bUPyxQNtsejU+wdronuxBL7DFiCBT9GV1clBZNrwWe2R+4w2zLRp48/F7BLBd++4VLy/nVvthBFPuR78g/Il35GYBgwN/BTy1hP4ToY8v5ZeTfpFytZ/QhPjOLTp6QIL8eRcxH0uX7+ivYmG43/vocx3uknMhv637Z5kIU/LtCrRmlnIWUdLC8TfX/R0itP2ZkffrXDSqk5mFlu3DjAG+Nmfx86iKKrniiXePrmXX8V50gSb0BDUXJ/tDdfJtIxfyNXtxZuQjt/dDS4cEsALrHNEbTDfjILBYN1BhOM5H5pks2/7qHhNtu00QkV1CRXbgnxOSiQe86IasYsupJsuUPdEpQFXKZ4EpLWj0I06MIb7xTqZQPDuwq9jtObBtG/qlCDXB0j4amSXMAdVMAoG/IIl3sl+IfHDqcFDNpA7l1e//jhvPt1DqHOalCd+7NsVrFfOmijNKyOBgRThXTCLblFk1yhUBYF9WjW/JnaiuHAqB96fUcwRoNa0pMeuzDdaIdABxuRDc5FHqSQQQzR43h2pPMRrhRtJmcQLO08s/YZKq9o4L8ceNUYtph79v78T7MyfxJo=
20+
# on:
21+
# branch: master
22+
# tags: false
23+
# node: 8
24+
# repo: Azure-Samples/react-aad-msal
25+
- provider: releases
26+
api_key:
27+
secure: o2qIYtsYuo5r8M/gkU9teD45/cp7uc9SP6sdmSKZlbxeh7gpv8q42QYNebBNaELBXepa2H+oCq3yh4GlhJbQ1glj+n+Ccr6fUosaPE9M0aJ3ECjI6twgX+As2g30Xj0UIiysORD8zGCKAuSecPkydE+/a/GXtA3TxReeDWVmPVrLnkx//sP00+S/hdRK8ocbARFRBU3VKltC6vs+zuBK8ggX8Ab71uBSiuceGdvgWEjy18zTeiJ2a2Ws9geSRgJjA1cW1tFhygIDfuePHkX9q0jvo9e7oxyMFX2iXSBfoyrT/AiuppzyG8IJZA/O1eLnhHWxRzRkQ7kJ4E90c2gRGOmo2CSqeUgv3eRuv183aWfPj0UvgqG/6lRUGF1QCyDU6yn/99T3XE8Uc7DkJGiFsUL/g1nP2FMqRRpkQLRsQFcdNxf8nO/ZzMXBI67Kryzm7clSg7qzQ8mz9xbqtvVAeflvDiGXnC5yMg1W/Ri40X/NsntSSLAn38MTs7qMpYVfnZrIiWm7jFRIkM023l9hLu5kOPWQQxoZTk6wZWbZkw3Q7yExmcTfA2LLJYqzSrQGRj8zO7RcqsSLGwOslr8a25d7mSIoUHZWMef0b1VNq9r5xEWhBJeA1V/zwRMWMuPzSomdG0A7oQEVvipayboeKQ8iPskJrvXG6YNqT2apfwo=
28+
file_glob: true
29+
file: dist/*
2030
on:
21-
branch: master
22-
tags: false
31+
tags: true
32+
node: 8
33+
repo: Azure-Samples/react-aad-msal
34+
env:
35+
global:
36+
secure: TljZCsFri7z/qySGC6p0JAoiLG/0IfAfwao1KxSKKblgUl6Q7yTGxet+W+6XPorMPRqZNlKtUqPKTZoWtRj7jJykjJXqqMF2SywuJq0+ldYPGWDA47cmpQcZ0tRCnrar+Fd+Ti5eItYbzaK7Wiy3eQWQYm5//9aOzTJe0gqImEV17lxmpcf/YlUSZE7YZbMu9Xxe6JqY7EQ6g3mWB7LXdgIRoMT6bbHneTsmBQDJjbMhH9yGpNY9aMN0mrN7m7uBLtBATzvJWUM3nNbokje5VxwJEr7Q13QeTIBUPOPJkGPlS1rcN3Fl86z4IyXZC+uVfeP0fBZFMpAbcgNceeHv3hnwnmx8ysPO00Js2ln/5jfVLuAqKfPjJ3Vdhvsz5mYgPyvi03v19+IM5SVvWT/Y8do1btdICkF+s0erMh1MWGwP94CI4DSJaM+lbKEJSO6oPZMubzTyZkDgu54plC/Y4gyVNKRetK1mkJ7lMwkHsZz/oLjqWFgc2QKe/H2o5ypaIqQm7zH5qWjtn5nGt3+9D9Xc6+OrK/scWTWpgnoOM33Bh/K4BP/sO3imcx9Lqs98ENSQJdhsBHno6MyBjPbVy4GPShhcYAh7Q4cyeH5lV4k0kDnuDo8Y/0gGxOK5QR1s+7uRHHWA9NCHwrUJiXygIrPFGFEWMUtAmx1kY+BOcDg=

.travis/pu.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ setup_git() {
66
# Set the user name and email to match the API token holder
77
# This will make sure the git commits will have the correct photo
88
# and the user gets the credit for a checkin
9-
git config --global user.email "liliankasem@gmail.com"
10-
git config --global user.name "liliankasem"
9+
git config --global user.email "github@cicoria.com"
10+
git config --global user.name "Mr.Robot"
1111
git config --global push.default matching
1212

1313
# Get the credentials from a file
@@ -34,12 +34,14 @@ make_version() {
3434

3535
upload_files() {
3636
# This make sure the current work area is pushed to the tip of the current branch
37-
git push origin HEAD:$TRAVIS_BRANCH
37+
# git push origin HEAD:$TRAVIS_BRANCH
3838

3939
# This pushes the new tag
40-
git push --tags
40+
git push --tags --dry-run
4141
}
42-
42+
echo "####### the env is..."
43+
env
44+
echo "####### end env"
4345
setup_git
4446
make_version
4547
upload_files

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-aad-msal",
3-
"version": "0.3.7",
3+
"version": "0.3.13",
44
"description": "A react component that integrates with Azure AD (v2, MSAL).",
55
"private": false,
66
"license": "MIT",
@@ -85,10 +85,7 @@
8585
"start-dev": "npm install && npm run build-dev && npm --prefix ./sample run start",
8686
"build": "npm run lint && tsc",
8787
"build-dev": "tsc",
88-
"test": "node scripts/test.js --env=jsdom",
89-
"prepublishOnly": "npm install && npm run build",
90-
"version": "npm run build && git add .",
91-
"postversion": "git push && git push --tags"
88+
"test": "node scripts/test.js --env=jsdom"
9289
},
9390
"devDependencies": {
9491
"@types/jest": "^22.2.3",

0 commit comments

Comments
 (0)