Skip to content

Commit

Permalink
Renamed :graphql to :server
Browse files Browse the repository at this point in the history
  • Loading branch information
retrodaredevil committed Mar 21, 2023
1 parent 4c3efd8 commit 3368b39
Show file tree
Hide file tree
Showing 77 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Install dependencies
run: (cd web && npm install)
- name: Build Boot Jar
run: ./gradlew graphql:bootJar
run: ./gradlew server:bootJar

# https://github.com/marketplace/actions/docker-login
- name: Log in to the Container registry
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
context: .
file: docker/solarthing-server/Dockerfile
build-args: |
BOOT_JAR=graphql/build/libs/graphql-0.0.1-SNAPSHOT.jar
BOOT_JAR=server/build/libs/server-0.0.1-SNAPSHOT.jar
push: true
platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
tags: ${{ steps.meta.outputs.tags }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ github.event.release.upload_url }}
asset_path: ./graphql/build/libs/graphql-0.0.1-SNAPSHOT.jar
asset_path: ./server/build/libs/server-0.0.1-SNAPSHOT.jar
asset_name: solarthing-graphql-${{ needs.shared-outputs.outputs.version }}.jar
asset_content_type: application/octet-stream
release-docs:
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ project(":serviceapi"){
annotationProcessor project(":process-annotations")
}
}
project(":graphql"){
project(":server"){
apply plugin: 'java'
dependencies {
api project(":core")
Expand Down
2 changes: 1 addition & 1 deletion docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ So, the only Dockerfiles that should be used to build solarthing should be on th

```shell
# run in solarthing root
docker build -f docker/solarthing-server/Dockerfile --build-arg BOOT_JAR=graphql/build/libs/graphql-0.0.1-SNAPSHOT.jar --tag wildmountainfarms/solarthing-server:latest .
docker build -f docker/solarthing-server/Dockerfile --build-arg BOOT_JAR=server/build/libs/server-0.0.1-SNAPSHOT.jar --tag wildmountainfarms/solarthing-server:latest .
```
4 changes: 2 additions & 2 deletions graphql_compile_and_move.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
BASEDIR=$(dirname "$0")
cd "$BASEDIR" || exit 1

./gradlew clean graphql:bootJar || exit 1
other/scripts/set_snapshot.sh "solarthing-graphql" graphql/build/libs/graphql-0.0.1-SNAPSHOT.jar || exit 1
./gradlew clean server:bootJar || exit 1
other/scripts/set_snapshot.sh "solarthing-graphql" server/build/libs/server-0.0.1-SNAPSHOT.jar || exit 1
echo "Compiled and moved graphql boot jar successfully"
6 changes: 3 additions & 3 deletions graphql/README.md → server/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ For grafana: https://github.com/fifemon/graphql-datasource
For testing your skills/syntax: https://graphql.org/swapi-graphql or https://nhzvc.csb.app/

### Compiling
Use `./gradlew graphql:bootJar` or [./graphql_compile_and_move.sh](../graphql_compile_and_move.sh) in the root directory.
Use `./gradlew server:bootJar` or [./graphql_compile_and_move.sh](../graphql_compile_and_move.sh) in the root directory.

Or `./gradlew graphql:bootRun` to run this
Or `./gradlew server:bootRun` to run this

### Future `Dockerfile`

Expand All @@ -31,6 +31,6 @@ https://reflectoring.io/spring-boot-docker/
When we create a `Dockerfile` from the boot jar, we will want to extract its layers.

```shell
java -Djarmode=layertools -jar ../graphql/build/libs/graphql-0.0.1-SNAPSHOT.jar extract
java -Djarmode=layertools -jar ../server/build/libs/server-0.0.1-SNAPSHOT.jar extract
# then copy the 4 folders to /app or something
```
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ rootProject.name = 'solarthing'
include 'core'
include 'client'
include 'serviceapi'
include 'graphql'
include 'server'
include 'common'
include 'process-annotations'
include 'action-node'
Expand Down
2 changes: 1 addition & 1 deletion web/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ task appNpmBuild(type: NpmTask) {
}
task generateCode(type: NpmTask) {
args = ["run", "graphql:codegen"]
dependsOn(":graphql:generateSchema")
dependsOn(":server:generateSchema")
}

assemble.dependsOn(appNpmBuild)

0 comments on commit 3368b39

Please sign in to comment.