Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/deploy-backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- sync-jira
steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
submodules: true
- name: Log in to the Container registry
Expand All @@ -44,7 +44,7 @@ jobs:
type=semver,pattern={{version}}
type=edge,branch=main
- name: Build and push Docker image
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: ./gropius-backend
build-args: |
Expand Down
70 changes: 32 additions & 38 deletions .github/workflows/deploy-website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,68 +6,62 @@ on:
- main
pull_request:

env:
NODE_OPTIONS: '--max_old_space_size=6144'

jobs:
deploy:
name: Deploy to GitHub Pages
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v5
with:
submodules: true
- uses: actions/setup-java@v3

# Rendering the ~5,500 generated pages peaks at roughly 11 GB resident. That fits a standard
# runner's 16 GB, but not with much to spare, and the default 4 GB swapfile is thin cover.
- name: Enlarge the swapfile
run: |
sudo swapoff -a
sudo fallocate -l 16G /mnt/swapfile
sudo chmod 600 /mnt/swapfile
sudo mkswap /mnt/swapfile
sudo swapon /mnt/swapfile
free -h

- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 21
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
- name: Execute Gradle build
run: ./gradlew build dokkaHtmlMultiModule
working-directory: gropius-backend
- name: Save graphql schemas
run: ./website/scripts/generate-graphql-schema.sh
- uses: actions/setup-node@v3
uses: gradle/actions/setup-gradle@v4

- uses: actions/setup-node@v4
with:
node-version: 21.x
node-version: 22.x
cache: npm
cache-dependency-path: "**/package-lock.json"

- name: Install website dependencies
run: npm ci
working-directory: website
- name: Install login-service dependencies
run: npm ci
working-directory: gropius-login-service/backend
- name: Save openapi schemas
run: ./website/scripts/generate-openapi-schema.sh
- name: Modify Dokka output
uses: graphglue/dokka-html-mdx-transform@v1.7.20
with:
src: "gropius-backend/build/dokka/htmlMultiModule"
modules: |
core
api-common
api-public
api-internal
sync
sync-github
sync-jira
dest: "website/docs"
folder: "api"
- name: Install dependencies
run: npm ci

# Runs Dokka, boots both API modules and the login service to dump their schemas, and runs
# TypeDoc - the same four stages `npm run generate` runs locally.
- name: Generate the API references
run: npm run generate
working-directory: website
- name: Update graphql documentation
run: ./website/scripts/update-graphql-doc.sh
- name: Update rest documentation
run: ./website/scripts/update-rest-doc.sh

- name: Build website
run: npm run build
run: npm run site
working-directory: website

- name: Deploy to GitHub Pages
uses: peaceiris/actions-gh-pages@v4
if: github.ref == 'refs/heads/main'
with:
deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
publish_dir: ./website/build
publish_dir: ./website/.vitepress/dist
force_orphan: true
external_repository: ccims/gropius-docs
publish_branch: main
publish_branch: main
21 changes: 10 additions & 11 deletions docker-compose-testing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ services:
login-service:
condition: service_started
environment:
- LOGIN_OAUTH_CLIENT_ID=8ee1287d-71ff-4c85-becd-cba829f390a0
- API_PUBLIC_ENDPOINT=http://api-public:8080/graphql
- LOGIN_SERVICE_ENDPOINT=http://login-service:3000
mongo:
Expand All @@ -149,11 +148,11 @@ services:
- login-service
environment:
- SPRING_NEO4J_URI=bolt://neo4j:7687
- SPRING_DATA_MONGODB_HOST=mongo
- SPRING_DATA_MONGODB_PORT=27017
- SPRING_DATA_MONGODB_DATABASE=gropius
- SPRING_DATA_MONGODB_USERNAME=root
- SPRING_DATA_MONGODB_PASSWORD=root
- SPRING_MONGODB_HOST=mongo
- SPRING_MONGODB_PORT=27017
- SPRING_MONGODB_DATABASE=gropius
- SPRING_MONGODB_USERNAME=root
- SPRING_MONGODB_PASSWORD=root
- GROPIUS_SYNC_LOGIN_SERVICE_BASE=http://login-service:3000/
- GROPIUS_SYNC_API_SECRET=TODO_loginSecret
healthcheck:
Expand All @@ -173,11 +172,11 @@ services:
- login-service
environment:
- SPRING_NEO4J_URI=bolt://neo4j:7687
- SPRING_DATA_MONGODB_HOST=mongo
- SPRING_DATA_MONGODB_PORT=27017
- SPRING_DATA_MONGODB_DATABASE=gropius
- SPRING_DATA_MONGODB_USERNAME=root
- SPRING_DATA_MONGODB_PASSWORD=root
- SPRING_MONGODB_HOST=mongo
- SPRING_MONGODB_PORT=27017
- SPRING_MONGODB_DATABASE=gropius
- SPRING_MONGODB_USERNAME=root
- SPRING_MONGODB_PASSWORD=root
- GROPIUS_SYNC_LOGIN_SERVICE_BASE=http://login-service:3000/
- GROPIUS_SYNC_API_SECRET=TODO_loginSecret
healthcheck:
Expand Down
20 changes: 10 additions & 10 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,11 @@ services:
- SPRING_NEO4J_URI=bolt://neo4j:7687
- SPRING_NEO4J_AUTHENTICATION_USERNAME=neo4j
- SPRING_NEO4J_AUTHENTICATION_PASSWORD=$GROPIUS_NEO4J_PASSWORD
- SPRING_DATA_MONGODB_HOST=mongo
- SPRING_DATA_MONGODB_PORT=27017
- SPRING_DATA_MONGODB_DATABASE=gropius
- SPRING_DATA_MONGODB_USERNAME=root
- SPRING_DATA_MONGODB_PASSWORD=$GROPIUS_MONGO_PASSWORD
- SPRING_MONGODB_HOST=mongo
- SPRING_MONGODB_PORT=27017
- SPRING_MONGODB_DATABASE=gropius
- SPRING_MONGODB_USERNAME=root
- SPRING_MONGODB_PASSWORD=$GROPIUS_MONGO_PASSWORD
- GROPIUS_SYNC_LOGIN_SERVICE_BASE=http://login-service:3000/
- GROPIUS_SYNC_API_SECRET=$GROPIUS_SYNC_API_SECRET
healthcheck:
Expand All @@ -165,11 +165,11 @@ services:
- SPRING_NEO4J_URI=bolt://neo4j:7687
- SPRING_NEO4J_AUTHENTICATION_USERNAME=neo4j
- SPRING_NEO4J_AUTHENTICATION_PASSWORD=$GROPIUS_NEO4J_PASSWORD
- SPRING_DATA_MONGODB_HOST=mongo
- SPRING_DATA_MONGODB_PORT=27017
- SPRING_DATA_MONGODB_DATABASE=gropius
- SPRING_DATA_MONGODB_USERNAME=root
- SPRING_DATA_MONGODB_PASSWORD=$GROPIUS_MONGO_PASSWORD
- SPRING_MONGODB_HOST=mongo
- SPRING_MONGODB_PORT=27017
- SPRING_MONGODB_DATABASE=gropius
- SPRING_MONGODB_USERNAME=root
- SPRING_MONGODB_PASSWORD=$GROPIUS_MONGO_PASSWORD
- GROPIUS_SYNC_LOGIN_SERVICE_BASE=http://login-service:3000/
- GROPIUS_SYNC_API_SECRET=$GROPIUS_SYNC_API_SECRET
healthcheck:
Expand Down
2 changes: 1 addition & 1 deletion gropius-backend
Submodule gropius-backend updated 49 files
+3 −3 .github/workflows/test-build.yaml
+5 −4 Dockerfile
+4 −6 api-common/build.gradle.kts
+4 −3 api-common/src/main/kotlin/gropius/graphql/GraphQLConfiguration.kt
+4 −4 api-common/src/main/kotlin/gropius/graphql/JSONCoercing.kt
+1 −1 api-common/src/main/kotlin/gropius/graphql/filter/TemplatedFieldsFilterEntry.kt
+1 −1 api-common/src/main/kotlin/gropius/graphql/filter/TemplatedFieldsFilterEntryDefinition.kt
+3 −4 api-internal/build.gradle.kts
+6 −9 api-public/build.gradle.kts
+2 −32 build.gradle.kts
+18 −0 buildSrc/build.gradle.kts
+12 −0 buildSrc/settings.gradle.kts
+8 −0 buildSrc/src/main/kotlin/gropius.application-conventions.gradle.kts
+28 −0 buildSrc/src/main/kotlin/gropius.kotlin-conventions.gradle.kts
+5 −10 core/build.gradle.kts
+12 −3 core/src/main/kotlin/gropius/dto/input/template/CreateBaseTemplateInput.kt
+1 −1 core/src/main/kotlin/gropius/model/issue/timeline/RemovedTemplatedFieldEvent.kt
+1 −1 core/src/main/kotlin/gropius/model/issue/timeline/TemplatedFieldChangedEvent.kt
+2 −2 core/src/main/kotlin/gropius/model/template/BaseTemplate.kt
+2 −2 core/src/main/kotlin/gropius/model/template/TemplatedNode.kt
+4 −1 core/src/main/kotlin/gropius/model/user/permission/BasePermission.kt
+8 −2 core/src/main/kotlin/gropius/model/user/permission/ComponentPermission.kt
+8 −2 core/src/main/kotlin/gropius/model/user/permission/GlobalPermission.kt
+8 −2 core/src/main/kotlin/gropius/model/user/permission/IMSPermission.kt
+8 −2 core/src/main/kotlin/gropius/model/user/permission/ProjectPermission.kt
+1 −1 core/src/main/kotlin/gropius/repository/GropiusRepository.kt
+2 −2 core/src/main/kotlin/gropius/repository/RepositoryExtensions.kt
+1 −1 core/src/main/kotlin/gropius/service/issue/IssueService.kt
+1 −1 core/src/main/kotlin/gropius/service/template/BaseTemplateService.kt
+3 −3 core/src/main/kotlin/gropius/service/template/TemplatedNodeService.kt
+7 −5 core/src/main/kotlin/gropius/util/JsonNodeMapper.kt
+12 −12 core/src/main/kotlin/gropius/util/schema/Validator.kt
+4 −15 gradle.properties
+50 −0 gradle/libs.versions.toml
+ gradle/wrapper/gradle-wrapper.jar
+2 −1 gradle/wrapper/gradle-wrapper.properties
+4 −4 gradlew
+94 −94 gradlew.bat
+10 −13 settings.gradle.kts
+7 −13 sync-github/build.gradle.kts
+2 −2 sync-github/src/main/kotlin/gropius/sync/github/GithubDataService.kt
+1 −1 sync-github/src/main/kotlin/gropius/sync/github/IssuePile.kt
+3 −1 sync-github/src/main/resources/application.yml
+6 −13 sync-jira/build.gradle.kts
+2 −2 sync-jira/src/main/kotlin/gropius/sync/jira/JiraDataService.kt
+1 −1 sync-jira/src/main/kotlin/gropius/sync/jira/model/IssueData.kt
+3 −1 sync-jira/src/main/resources/application.yml
+11 −17 sync/build.gradle.kts
+1 −1 sync/src/main/kotlin/gropius/sync/JsonHelper.kt
2 changes: 1 addition & 1 deletion gropius-frontend
Submodule gropius-frontend updated 314 files
2 changes: 1 addition & 1 deletion gropius-login-service
32 changes: 13 additions & 19 deletions website/.gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
# Dependencies
/node_modules

# Production
/build
# VitePress
/.vitepress/cache
/.vitepress/dist

# Generated files
.docusaurus
.cache-loader
# Generated by `npm run generate`; see scripts/docs.mjs
/.vitepress/dokka
/.vitepress/generated
/docs/api
/docs/graphql/public
/docs/graphql/internal
/docs/login-service

# Schemas dumped from the running services
/schemas

# Misc
.DS_Store
Expand All @@ -18,17 +26,3 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# generated api documentation
docs/api/
docs/login-service-api/

# generated schema
schemas/

# generated graphql documentation
docs/graphql/api-public/
docs/graphql/api-internal/

# generated rest documentation
rest-docs/login-service/
Loading
Loading