Skip to content

Commit a8790c8

Browse files
zqr10159Aias00
andauthored
[release] release 1.6.1 rc2 and fix crlf encoding (apache#2724)
Signed-off-by: Logic <[email protected]> Co-authored-by: aias00 <[email protected]>
1 parent b9fdfbd commit a8790c8

File tree

11 files changed

+12676
-12676
lines changed

11 files changed

+12676
-12676
lines changed

.devcontainer/devcontainer.json

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
1-
{
2-
"name": "Hertzbeat DevContainer",
3-
"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
4-
"features": {
5-
"ghcr.io/devcontainers/features/java:1": {
6-
"version": "17",
7-
"installMaven": "true",
8-
"installGradle": "false"
9-
},
10-
"ghcr.io/devcontainers/features/node:1": {
11-
"version": "20"
12-
},
13-
"ghcr.io/devcontainers/features/git-lfs:1.1.0": {}
14-
},
15-
"customizations": {
16-
"vscode": {
17-
"settings": {},
18-
// same extensions as Gitpod, should match /.gitpod.yml
19-
"extensions": [
20-
"vscjava.vscode-java-pack",
21-
"editorconfig.editorconfig",
22-
"dbaeumer.vscode-eslint",
23-
"stylelint.vscode-stylelint",
24-
"DavidAnson.vscode-markdownlint",
25-
"ms-azuretools.vscode-docker",
26-
"cweijan.vscode-database-client2",
27-
"GitHub.vscode-pull-request-github"
28-
]
29-
}
30-
},
31-
"portsAttributes": {
32-
"4200": {
33-
"label": "Hertzbeat Web",
34-
"onAutoForward": "notify"
35-
}
36-
},
37-
"postCreateCommand": "java -version"
38-
}
1+
{
2+
"name": "Hertzbeat DevContainer",
3+
"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
4+
"features": {
5+
"ghcr.io/devcontainers/features/java:1": {
6+
"version": "17",
7+
"installMaven": "true",
8+
"installGradle": "false"
9+
},
10+
"ghcr.io/devcontainers/features/node:1": {
11+
"version": "20"
12+
},
13+
"ghcr.io/devcontainers/features/git-lfs:1.1.0": {}
14+
},
15+
"customizations": {
16+
"vscode": {
17+
"settings": {},
18+
// same extensions as Gitpod, should match /.gitpod.yml
19+
"extensions": [
20+
"vscjava.vscode-java-pack",
21+
"editorconfig.editorconfig",
22+
"dbaeumer.vscode-eslint",
23+
"stylelint.vscode-stylelint",
24+
"DavidAnson.vscode-markdownlint",
25+
"ms-azuretools.vscode-docker",
26+
"cweijan.vscode-database-client2",
27+
"GitHub.vscode-pull-request-github"
28+
]
29+
}
30+
},
31+
"portsAttributes": {
32+
"4200": {
33+
"label": "Hertzbeat Web",
34+
"onAutoForward": "notify"
35+
}
36+
},
37+
"postCreateCommand": "java -version"
38+
}

.gitpod.yml

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
1-
tasks:
2-
3-
- name: Run backend
4-
before: cd manager
5-
command: |
6-
gp sync-await setup-backend
7-
mvn spring-boot:run
8-
9-
- name: Run frontend
10-
before: cd web-app
11-
command: |
12-
gp sync-await setup-frontend
13-
yarn start --public-host "`gp url 4200`"
14-
openMode: split-right
15-
16-
- name: Setup backend
17-
init: |
18-
sdk install java 17.0.11.fx-zulu < /dev/null
19-
sdk default java 17.0.11.fx-zulu < /dev/null
20-
mvn clean install -DskipTests
21-
command: |
22-
gp sync-done setup-backend
23-
exit 0
24-
25-
- name: Setup frontend
26-
init: |
27-
cd web-app && yarn install
28-
command: |
29-
gp sync-done setup-frontend
30-
exit 0
31-
openMode: split-right
32-
33-
vscode:
34-
extensions:
35-
- vscjava.vscode-java-pack
36-
- editorconfig.editorconfig
37-
- dbaeumer.vscode-eslint
38-
- stylelint.vscode-stylelint
39-
- DavidAnson.vscode-markdownlint
40-
- ms-azuretools.vscode-docker
41-
- cweijan.vscode-database-client2
42-
- GitHub.vscode-pull-request-github
43-
44-
ports:
45-
- port: 4200
46-
name: Hertzbeat
47-
onOpen: open-browser
48-
49-
- port: 1157
50-
onOpen: ignore
51-
52-
- port: 1158
53-
onOpen: ignore
1+
tasks:
2+
3+
- name: Run backend
4+
before: cd manager
5+
command: |
6+
gp sync-await setup-backend
7+
mvn spring-boot:run
8+
9+
- name: Run frontend
10+
before: cd web-app
11+
command: |
12+
gp sync-await setup-frontend
13+
yarn start --public-host "`gp url 4200`"
14+
openMode: split-right
15+
16+
- name: Setup backend
17+
init: |
18+
sdk install java 17.0.11.fx-zulu < /dev/null
19+
sdk default java 17.0.11.fx-zulu < /dev/null
20+
mvn clean install -DskipTests
21+
command: |
22+
gp sync-done setup-backend
23+
exit 0
24+
25+
- name: Setup frontend
26+
init: |
27+
cd web-app && yarn install
28+
command: |
29+
gp sync-done setup-frontend
30+
exit 0
31+
openMode: split-right
32+
33+
vscode:
34+
extensions:
35+
- vscjava.vscode-java-pack
36+
- editorconfig.editorconfig
37+
- dbaeumer.vscode-eslint
38+
- stylelint.vscode-stylelint
39+
- DavidAnson.vscode-markdownlint
40+
- ms-azuretools.vscode-docker
41+
- cweijan.vscode-database-client2
42+
- GitHub.vscode-pull-request-github
43+
44+
ports:
45+
- port: 4200
46+
name: Hertzbeat
47+
onOpen: open-browser
48+
49+
- port: 1157
50+
onOpen: ignore
51+
52+
- port: 1158
53+
onOpen: ignore

0 commit comments

Comments
 (0)