Skip to content

Commit fdd9fc5

Browse files
authored
Merge pull request #7 from java-sheets/feature/execution
Add script for CI build
2 parents 84c7778 + a3bf39d commit fdd9fc5

5 files changed

Lines changed: 35 additions & 5 deletions

File tree

‎docker-compose.dev.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
version: '3.7'
2+
services:
3+
server:
4+
image: ehenoma/jsheets:latest
5+
build:
6+
# Make sure to run 'gradle copyDependencies' before building
7+
dockerfile: server/deploy/Dockerfile
8+
context: .
9+
container_name: jsheets-server
10+
environment:
11+
JSHEETS_SERVER_PORT: 8080
12+
JSHEETS_MONGODB_URI: mongodb://root:root@document-store/jsheets
13+
ports:
14+
- "8080:8080"
15+
networks:
16+
- database
17+
document-store:
18+
container_name: document-store
19+
image: mongo:latest
20+
environment:
21+
MONGO_INITDB_ROOT_USERNAME: root
22+
MONGO_INITDB_ROOT_PASSWORD: root
23+
networks:
24+
- database
25+
26+
networks:
27+
database:

‎docker-compose.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@ version: '3.7'
22
services:
33
server:
44
image: ehenoma/jsheets:latest
5-
build:
6-
# Make sure to run 'gradle copyDependencies' before building
7-
dockerfile: server/deploy/Dockerfile
8-
context: .
9-
container_name: jsheets-server
105
environment:
116
JSHEETS_SERVER_PORT: 8080
127
JSHEETS_MONGODB_URI: mongodb://root:root@document-store/jsheets

‎website/.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ public/theme/
1111
# production
1212
/build
1313

14+
1415
# misc
1516
.DS_Store
1617
.env.local
@@ -21,3 +22,6 @@ public/theme/
2122
npm-debug.log*
2223
yarn-debug.log*
2324
yarn-error.log*
25+
26+
website/src/editor/java/parser.js
27+
website/src/editor/java/parser.terms.js

‎website/package.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@
5353
"build": "react-scripts build",
5454
"test": "react-scripts test",
5555
"eject": "react-scripts eject",
56+
"build-all": "npm run build-theme && npm run build-grammar && npm run build",
57+
"build-grammar": "lezer-generator src/editor/java/java.grammar -o src/editor/java/parser",
5658
"build-theme": "npm run build-light-theme && npm run build-dark-theme",
5759
"build-light-theme": "lessc src/theme/light.less public/theme/light.css -js",
5860
"build-dark-theme": "lessc src/theme/dark.less public/theme/dark.css -js"

‎website/src/editor/java/language.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import {
88
LRLanguage
99
} from "@codemirror/language"
1010
import {styleTags, Tag, tags as t} from "@codemirror/highlight"
11+
12+
// Make sure that the code is generated (npm run build-grammar)
1113
import {parser} from "./parser";
1214

1315
export const customTags = {

0 commit comments

Comments
 (0)