Skip to content

Commit dac2810

Browse files
jdneojdneo
authored
Merge branch 'master' into develop
2 parents 3a70d4e + 6b95d5c commit dac2810

File tree

6 files changed

+77
-26
lines changed

6 files changed

+77
-26
lines changed

‎.github/workflows/build.yml

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
9+
jobs:
10+
linux:
11+
name: Linux
12+
runs-on: ubuntu-latest
13+
timeout-minutes: 30
14+
steps:
15+
- uses: actions/checkout@v2
16+
17+
- name: Setup Node.js environment
18+
uses: actions/setup-node@v2
19+
with:
20+
node-version: 12
21+
22+
- name: Install Node.js modules
23+
run: npm install
24+
25+
- name: Lint
26+
run: npm run lint
27+
28+
- name: VSCE Packge
29+
run: npx vsce package
30+
31+
windows:
32+
name: Windows
33+
runs-on: windows-latest
34+
timeout-minutes: 30
35+
steps:
36+
- uses: actions/checkout@v2
37+
38+
- name: Setup Node.js environment
39+
uses: actions/setup-node@v2
40+
with:
41+
node-version: 12
42+
43+
- name: Install Node.js modules
44+
run: npm install
45+
46+
- name: Lint
47+
run: npm run lint
48+
49+
- name: VSCE Packge
50+
run: npx vsce package
51+
52+
darwin:
53+
name: macOS
54+
runs-on: macos-latest
55+
timeout-minutes: 30
56+
steps:
57+
- uses: actions/checkout@v2
58+
59+
- name: Setup Node.js environment
60+
uses: actions/setup-node@v2
61+
with:
62+
node-version: 12
63+
64+
- name: Install Node.js modules
65+
run: npm install
66+
67+
- name: Lint
68+
run: npm run lint
69+
70+
- name: VSCE Packge
71+
run: npx vsce package

‎.travis.yml

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

‎.vscodeignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ test/**
55
src/**
66
**/*.map
77
.gitignore
8-
.travis.yml
98
package-lock.json
109
tsconfig.json
1110
tslint.json

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<img src="https://raw.githubusercontent.com/LeetCode-OpenSource/vscode-leetcode/master/resources/LeetCode.png" alt="">
77
</p>
88
<p align="center">
9-
<a href="https://travis-ci.org/LeetCode-OpenSource/vscode-leetcode">
10-
<img src="https://img.shields.io/travis/LeetCode-OpenSource/vscode-leetcode.svg?style=flat-square" alt="">
9+
<a href="https://github.com/LeetCode-OpenSource/vscode-leetcode/actions?query=workflow%3ACI+branch%3Amaster">
10+
<img src="https://img.shields.io/github/workflow/status/LeetCode-OpenSource/vscode-leetcode/CI/master?style=flat-square" alt="">
1111
</a>
1212
<a href="https://gitter.im/vscode-leetcode/Lobby">
1313
<img src="https://img.shields.io/gitter/room/LeetCode-OpenSource/vscode-leetcode.svg?style=flat-square" alt="">
@@ -129,7 +129,7 @@ Thanks for [@yihong0618](https://github.com/yihong0618) provided a workaround wh
129129
| `leetcode.workspaceFolder` | Specify the path of the workspace folder to store the problem files. | `""` |
130130
| `leetcode.filePath` | Specify the relative path under the workspace and the file name to save the problem files. More details can be found [here](https://github.com/LeetCode-OpenSource/vscode-leetcode/wiki/Customize-the-Relative-Folder-and-the-File-Name-of-the-Problem-File). | |
131131
| `leetcode.enableStatusBar` | Specify whether the LeetCode status bar will be shown or not. | `true` |
132-
| `leetcode.editor.shortcuts` | Specify the customized shorcuts in editors. Supported values are: `submit`, `test`, `star`, `solution` and `description`. | `["submit, test"]` |
132+
| `leetcode.editor.shortcuts` | Specify the customized shortcuts in editors. Supported values are: `submit`, `test`, `star`, `solution` and `description`. | `["submit, test"]` |
133133
| `leetcode.enableSideMode` | Specify whether `preview`, `solution` and `submission` tab should be grouped into the second editor column when solving a problem. | `true` |
134134
| `leetcode.nodePath` | Specify the `Node.js` executable path. for example, C:\Program Files\nodejs\node.exe | `node` |
135135
| `leetcode.showCommentDescription` | Specify whether to include the problem description in the comments | `false` |

‎docs/README_zh-CN.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<img src="https://raw.githubusercontent.com/LeetCode-OpenSource/vscode-leetcode/master/resources/LeetCode.png" alt="">
77
</p>
88
<p align="center">
9-
<a href="https://travis-ci.org/LeetCode-OpenSource/vscode-leetcode">
10-
<img src="https://img.shields.io/travis/LeetCode-OpenSource/vscode-leetcode.svg?style=flat-square" alt="">
9+
<a href="https://github.com/LeetCode-OpenSource/vscode-leetcode/actions?query=workflow%3ACI+branch%3Amaster">
10+
<img src="https://img.shields.io/github/workflow/status/LeetCode-OpenSource/vscode-leetcode/CI/master?style=flat-square" alt="">
1111
</a>
1212
<a href="https://gitter.im/vscode-leetcode/Lobby">
1313
<img src="https://img.shields.io/gitter/room/LeetCode-OpenSource/vscode-leetcode.svg?style=flat-square" alt="">

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@
647647
"Show the problem description page."
648648
]
649649
},
650-
"description": "Customize the shorcuts in editors."
650+
"description": "Customize the shortcuts in editors."
651651
},
652652
"leetcode.enableSideMode": {
653653
"type": "boolean",

0 commit comments

Comments
 (0)