Skip to content

Commit 0e6ca28

Browse files
yamalightyamalight
committed
Merge branch 'develop', prepare 6.1.2
2 parents 9cdf2f7 + aa89e87 commit 0e6ca28

29 files changed

+451
-367
lines changed

‎.eslintrc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"trailingComma": "es5",
1515
"singleQuote": true,
1616
"bracketSpacing": false,
17-
"printWidth": 120
17+
"printWidth": 120,
18+
"arrowParens": "avoid"
1819
}
1920
]
2021
}

‎.github/workflows/prerelease.yml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: Prerelease
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
8+
env:
9+
YARN_CACHE_FOLDER: ~/.yarn
10+
11+
jobs:
12+
test:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v2
16+
- uses: actions/cache@v1
17+
with:
18+
path: ${{ env.YARN_CACHE_FOLDER }}
19+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
20+
restore-keys: |
21+
${{ runner.os }}-yarn-
22+
- uses: actions/setup-node@v1
23+
with:
24+
node-version: '12.x'
25+
registry-url: https://registry.npmjs.org
26+
- name: install
27+
run: yarn --frozen-lockfile
28+
29+
# lint, test, report coverage
30+
- name: lint
31+
run: yarn lint
32+
- name: test
33+
run: yarn test
34+
35+
# upload coverage
36+
- name: Coveralls
37+
uses: coverallsapp/github-action@master
38+
with:
39+
github-token: ${{ secrets.GITHUB_TOKEN }}
40+
41+
publish:
42+
needs: test
43+
runs-on: ubuntu-latest
44+
steps:
45+
- uses: actions/checkout@v2
46+
- uses: actions/cache@v1
47+
with:
48+
path: ${{ env.YARN_CACHE_FOLDER }}
49+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
50+
restore-keys: |
51+
${{ runner.os }}-yarn-
52+
- uses: actions/setup-node@v1
53+
with:
54+
node-version: '12.x'
55+
registry-url: https://registry.npmjs.org
56+
57+
# build
58+
- name: install
59+
run: yarn --frozen-lockfile
60+
- name: build
61+
run: yarn build
62+
- name: package
63+
run: yarn package
64+
65+
# deploy to npm
66+
- run: npm publish --access public --tag next
67+
env:
68+
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

‎.github/workflows/release.yml‎

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
name: Release
2+
3+
on:
4+
push:
5+
tags:
6+
- '*'
7+
8+
env:
9+
YARN_CACHE_FOLDER: ~/.yarn
10+
11+
jobs:
12+
test:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v2
16+
- uses: actions/cache@v1
17+
with:
18+
path: ${{ env.YARN_CACHE_FOLDER }}
19+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
20+
restore-keys: |
21+
${{ runner.os }}-yarn-
22+
- uses: actions/setup-node@v1
23+
with:
24+
node-version: '12.x'
25+
registry-url: https://registry.npmjs.org
26+
- name: install
27+
run: yarn --frozen-lockfile
28+
29+
# lint, test, report coverage
30+
- name: lint
31+
run: yarn lint
32+
- name: test
33+
run: yarn test
34+
35+
# upload coverage
36+
- name: Coveralls
37+
uses: coverallsapp/github-action@master
38+
with:
39+
github-token: ${{ secrets.GITHUB_TOKEN }}
40+
41+
publish:
42+
needs: test
43+
runs-on: ubuntu-latest
44+
steps:
45+
- uses: actions/checkout@v2
46+
- uses: actions/cache@v1
47+
with:
48+
path: ${{ env.YARN_CACHE_FOLDER }}
49+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
50+
restore-keys: |
51+
${{ runner.os }}-yarn-
52+
- uses: actions/setup-node@v1
53+
with:
54+
node-version: '12.x'
55+
registry-url: https://registry.npmjs.org
56+
57+
# build
58+
- name: install
59+
run: yarn --frozen-lockfile
60+
- name: build
61+
run: yarn build
62+
- name: package
63+
run: yarn package
64+
65+
# deploy to npm
66+
- run: npm publish --access public
67+
env:
68+
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
69+
70+
# deploy to new github release
71+
- name: Create Release
72+
id: create_release
73+
uses: actions/create-release@v1
74+
env:
75+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
76+
with:
77+
tag_name: ${{ github.ref }}
78+
release_name: Release ${{ github.ref }}
79+
draft: false
80+
prerelease: false
81+
- name: Publish linux binaries as release assets
82+
id: upload-release-asset
83+
uses: actions/upload-release-asset@v1
84+
env:
85+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
86+
with:
87+
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
88+
asset_path: ./exoframe-linux
89+
asset_name: exoframe-linux
90+
asset_content_type: application/binary
91+
- name: Publish macos binaries as release assets
92+
id: upload-release-asset
93+
uses: actions/upload-release-asset@v1
94+
env:
95+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
96+
with:
97+
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
98+
asset_path: ./exoframe-macos
99+
asset_name: exoframe-macos
100+
asset_content_type: application/binary
101+
- name: Publish windows binaries as release assets
102+
id: upload-release-asset
103+
uses: actions/upload-release-asset@v1
104+
env:
105+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
106+
with:
107+
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
108+
asset_path: ./exoframe-win.exe
109+
asset_name: exoframe-win.exe
110+
asset_content_type: application/binary

‎.github/workflows/test.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Test
2+
3+
# test on every push and on PRs
4+
on:
5+
push:
6+
branches: '*'
7+
pull_request:
8+
9+
env:
10+
YARN_CACHE_FOLDER: ~/.yarn
11+
12+
jobs:
13+
test:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v2
17+
- uses: actions/cache@v1
18+
with:
19+
path: ${{ env.YARN_CACHE_FOLDER }}
20+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
21+
restore-keys: |
22+
${{ runner.os }}-yarn-
23+
- uses: actions/setup-node@v1
24+
with:
25+
node-version: '12.x'
26+
- name: install
27+
run: yarn --frozen-lockfile
28+
- name: lint
29+
run: yarn lint
30+
- name: test
31+
run: yarn test
32+
- name: coveralls
33+
uses: coverallsapp/github-action@master
34+
with:
35+
github-token: ${{ secrets.GITHUB_TOKEN }}

‎.prettierrc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
"trailingComma": "es5",
33
"singleQuote": true,
44
"bracketSpacing": false,
5-
"printWidth": 120
5+
"printWidth": 120,
6+
"arrowParens": "avoid"
67
}

‎.travis.yml‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "exoframe",
3-
"version": "6.1.1",
3+
"version": "6.1.2-dev",
44
"description": "Exoframe is a self-hosted tool that allows simple one-command deployments using Docker",
55
"main": "dist/index.js",
66
"repository": "[email protected]:exoframejs/exoframe.git",
@@ -26,7 +26,7 @@
2626
"@zeit/ncc": "^0.21.0",
2727
"apache-md5": "^1.1.2",
2828
"babel-eslint": "^10.0.3",
29-
"chalk": "^3.0.0",
29+
"chalk": "^4.0.0",
3030
"cli-table3": "^0.5.1",
3131
"coveralls": "^3.0.7",
3232
"eslint": "^6.6.0",
@@ -46,13 +46,13 @@
4646
"latest-version": "^5.1.0",
4747
"lodash": "^4.17.15",
4848
"multimatch": "^4.0.0",
49-
"nock": "^11.7.0",
49+
"nock": "^12.0.3",
5050
"open": "^7.0.0",
5151
"ora": "^4.0.2",
5252
"pkg": "^4.4.0",
53-
"prettier": "^1.18.2",
53+
"prettier": "^2.0.4",
5454
"semver-diff": "^3.1.1",
55-
"sinon": "^8.1.1",
55+
"sinon": "^9.0.2",
5656
"tar-fs": "^2.0.0",
5757
"yargs": "^15.1.0"
5858
},

‎test/__snapshots__/config.test.js.snap‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Array [
66
"Creating new config..",
77
],
88
Array [
9-
"[32mConfig created![39m",
9+
"Config created!",
1010
],
1111
]
1212
`;
@@ -20,7 +20,7 @@ Array [
2020
"Creating new config for function deployment..",
2121
],
2222
Array [
23-
"[32mConfig created![39m",
23+
"Config created!",
2424
],
2525
]
2626
`;
@@ -31,47 +31,47 @@ Array [
3131
"Creating new config..",
3232
],
3333
Array [
34-
"[33mMode changed to[39m",
34+
"Mode changed to",
3535
"non-interactive",
3636
],
3737
Array [
3838
"Setting",
39-
"[31mdomain[39m",
39+
"domain",
4040
"to",
41-
"[33mtest123.dev[39m",
41+
"test123.dev",
4242
],
4343
Array [
4444
"Setting",
45-
"[31mport[39m",
45+
"port",
4646
"to",
47-
"[33m1234[39m",
47+
"1234",
4848
],
4949
Array [
5050
"Setting",
51-
"[31mname[39m",
51+
"name",
5252
"to",
53-
"[33mtest name 123[39m",
53+
"test name 123",
5454
],
5555
Array [
5656
"Setting",
57-
"[31mproject[39m",
57+
"project",
5858
"to",
59-
"[33mgive-project-name[39m",
59+
"give-project-name",
6060
],
6161
Array [
6262
"Setting",
63-
"[31mrestart[39m",
63+
"restart",
6464
"to",
65-
"[33munless-stopped[39m",
65+
"unless-stopped",
6666
],
6767
Array [
6868
"Setting",
69-
"[31mhostname[39m",
69+
"hostname",
7070
"to",
71-
"[33mtest123.dev[39m",
71+
"test123.dev",
7272
],
7373
Array [
74-
"[32mConfig created![39m",
74+
"Config created!",
7575
],
7676
]
7777
`;

0 commit comments

Comments
 (0)