Skip to content

Commit 3587bd0

Browse files
authored
Merge pull request #1291 from shockey/v/3.0.6
v3.0.6
2 parents 91213fd + 40d8247 commit 3587bd0

File tree

13 files changed

+129
-74
lines changed

13 files changed

+129
-74
lines changed

.travis.yml

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,29 @@ branches:
77
only:
88
- master
99
- /^v\d+\.\d+(\.\d+)?(-\S*)?$/
10-
before_deploy: "npm run build-core"
10+
before_deploy:
11+
- "npm run build"
1112
env:
1213
- DOCKER_IMAGE_NAME=swaggerapi/swagger-editor
1314
deploy:
14-
provider: npm
15-
16-
skip_cleanup: true
17-
api_key:
18-
secure: "jFzdukXjNKiESkh/61VUNIYHavpovSKAoVHg4ConrpnYimkrjB13mTB2ZMWXdEbNyUxfI48dYBIlnKRZfwaJ5jZ/rtyQONKslE/SDV1EgEXaL1KPv1rB2mbC3U2YiXV/QuusnmNLdxu8iAqnVcJwuCUMAb11Toq9p2KmAc2Ty8g="
19-
on:
20-
tags: true
21-
repo: swagger-api/swagger-editor
22-
node: '6.9'
15+
- provider: npm
16+
17+
skip_cleanup: true
18+
api_key:
19+
secure: "jFzdukXjNKiESkh/61VUNIYHavpovSKAoVHg4ConrpnYimkrjB13mTB2ZMWXdEbNyUxfI48dYBIlnKRZfwaJ5jZ/rtyQONKslE/SDV1EgEXaL1KPv1rB2mbC3U2YiXV/QuusnmNLdxu8iAqnVcJwuCUMAb11Toq9p2KmAc2Ty8g="
20+
on:
21+
tags: true
22+
repo: swagger-api/swagger-editor
23+
node: '6.9'
24+
- provider: script
25+
skip_cleanup: true
26+
script: swagger-editor-dist-package/deploy.sh
27+
on:
28+
tags: true
29+
repo: swagger-api/swagger-editor
30+
node: '6.9'
2331
after_success:
24-
- if [ $DOCKER_HUB_USERNAME ]; then
32+
- if [ $DOCKER_HUB_USERNAME ]; then
2533
docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD;
2634

2735
if [ ! -z "$TRAVIS_TAG" ]; then
@@ -39,4 +47,4 @@ after_success:
3947
docker tag $DOCKER_IMAGE_NAME $DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG;
4048
docker push $DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG;
4149
fi;
42-
fi;
50+
fi;

dist/swagger-editor-bundle.js

Lines changed: 56 additions & 54 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/swagger-editor-bundle.js.map

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

dist/swagger-editor.css

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

dist/swagger-editor.js

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

dist/validation.worker.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/validation.worker.js.map

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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "swagger-editor",
33
"description": "Swagger Editor",
4-
"version": "3.0.5",
4+
"version": "3.0.6",
55
"main": "dist/swagger-editor.js",
66
"repository": "[email protected]:swagger-api/swagger-editor.git",
77
"license": "Apache-2.0",
@@ -51,7 +51,7 @@
5151
"react-file-download": "^0.3.2",
5252
"react-redux": "^4.x.x",
5353
"redux": "^3.x.x",
54-
"swagger-ui": "^3.0.6"
54+
"swagger-ui": "^3.0.7"
5555
},
5656
"devDependencies": {
5757
"autoprefixer": "6.6.1",
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
README.md
2+
deploy.sh

swagger-editor-dist-package/.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
//registry.npmjs.org/:_authToken=${NPM_TOKEN}

0 commit comments

Comments
 (0)