Skip to content

Add script for CI build #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ehenoma merged 2 commits into from
Sep 29, 2021
Merged

Add script for CI build #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bce710a
Add production docker-compose file
ehenoma Sep 29, 2021
a3bf39d
Add commands to build website from CI
ehenoma Sep 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions docker-compose.dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
version: '3.7'
services:
server:
image: ehenoma/jsheets:latest
build:
# Make sure to run 'gradle copyDependencies' before building
dockerfile: server/deploy/Dockerfile
context: .
container_name: jsheets-server
environment:
JSHEETS_SERVER_PORT: 8080
JSHEETS_MONGODB_URI: mongodb://root:root@document-store/jsheets
ports:
- "8080:8080"
networks:
- database
document-store:
container_name: document-store
image: mongo:latest
environment:
MONGO_INITDB_ROOT_USERNAME: root
MONGO_INITDB_ROOT_PASSWORD: root
networks:
- database

networks:
database:
5 changes: 0 additions & 5 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@ version: '3.7'
services:
server:
image: ehenoma/jsheets:latest
build:
# Make sure to run 'gradle copyDependencies' before building
dockerfile: server/deploy/Dockerfile
context: .
container_name: jsheets-server
environment:
JSHEETS_SERVER_PORT: 8080
JSHEETS_MONGODB_URI: mongodb://root:root@document-store/jsheets
Expand Down
4 changes: 4 additions & 0 deletions website/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ public/theme/
# production
/build


# misc
.DS_Store
.env.local
Expand All @@ -21,3 +22,6 @@ public/theme/
npm-debug.log*
yarn-debug.log*
yarn-error.log*

website/src/editor/java/parser.js
website/src/editor/java/parser.terms.js
2 changes: 2 additions & 0 deletions website/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject",
"build-all": "npm run build-theme && npm run build-grammar && npm run build",
"build-grammar": "lezer-generator src/editor/java/java.grammar -o src/editor/java/parser",
"build-theme": "npm run build-light-theme && npm run build-dark-theme",
"build-light-theme": "lessc src/theme/light.less public/theme/light.css -js",
"build-dark-theme": "lessc src/theme/dark.less public/theme/dark.css -js"
Expand Down
2 changes: 2 additions & 0 deletions website/src/editor/java/language.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import {
LRLanguage
} from "@codemirror/language"
import {styleTags, Tag, tags as t} from "@codemirror/highlight"

// Make sure that the code is generated (npm run build-grammar)
import {parser} from "./parser";

export const customTags = {
Expand Down