Refs #1 - start refactor

Author: chrissearle

.github/workflows/ci.yaml .github/workflows/frontend.yaml

@@ -2,9 +2,8 @@ name: Build
 
 on:
   push:
-    paths-ignore:
-      - bruno/**
-      - .run/**
+    paths:
+      - frontend/**
 
 jobs:
   push:
@@ -14,15 +13,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set up JDK
-        uses: actions/setup-java@v4
-        with:
-          java-version: '22'
-          distribution: 'temurin'
-
-      - name: Build
-        run: ./gradlew clean build
-
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
 
@@ -38,14 +28,14 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v5
         with:
-          context: .
+          context: ./frontend
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: "${{ secrets.DOCKERHUB_USERNAME }}/jzhistory:${{ github.sha }},${{ secrets.DOCKERHUB_USERNAME }}/jzhistory:latest"
+          tags: "${{ secrets.DOCKERHUB_USERNAME }}/jzfrontend:${{ github.sha }},${{ secrets.DOCKERHUB_USERNAME }}/jzfrontend:latest"
 
       - name: Create staging
         if: github.ref == 'refs/heads/main'
-        run: docker buildx imagetools create -t ${{ secrets.DOCKERHUB_USERNAME }}/jzhistory:staging ${{ secrets.DOCKERHUB_USERNAME }}/jzhistory:latest
+        run: docker buildx imagetools create -t ${{ secrets.DOCKERHUB_USERNAME }}/jzfrontend:staging ${{ secrets.DOCKERHUB_USERNAME }}/jzfrontend:latest
 
       - name: Generate summary
         run: |

.github/workflows/index.yaml

@@ -0,0 +1,73 @@
+name: Build
+
+on:
+  push:
+    paths:
+      - index/**
+
+jobs:
+  push:
+    if: false
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: '22'
+          distribution: 'temurin'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Build
+        run: ./gradlew :index:clean :index:build
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to DockerHub Registry
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: ./index
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: "${{ secrets.DOCKERHUB_USERNAME }}/jzindex:${{ github.sha }},${{ secrets.DOCKERHUB_USERNAME }}/jzindex:latest"
+
+      - name: Create staging
+        if: github.ref == 'refs/heads/main'
+        run: docker buildx imagetools create -t ${{ secrets.DOCKERHUB_USERNAME }}/jzindex:staging ${{ secrets.DOCKERHUB_USERNAME }}/jzindex:latest
+
+      - name: Generate summary
+        run: |
+          echo "Tag: ${{ github.sha }}" >> $GITHUB_STEP_SUMMARY
+
+      - name: Upload reports if failed
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: index-reports
+          path: |
+            **/build/reports/
+            **/build/test-results/
+
+      - name: Upload coverage if passed
+        if: success()
+        uses: actions/upload-artifact@v4
+        with:
+          name: index-coverage
+          path: |
+            **/build/reports/jacoco/

.github/workflows/release.yaml

@@ -0,0 +1,71 @@
+name: Build
+
+on:
+  push:
+    paths:
+      - search/**
+
+jobs:
+  push:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: '22'
+          distribution: 'temurin'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Build
+        run: ./gradlew :search:clean :search:build
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to DockerHub Registry
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: ./search
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: "${{ secrets.DOCKERHUB_USERNAME }}/jzsearch:${{ github.sha }},${{ secrets.DOCKERHUB_USERNAME }}/jzsearch:latest"
+
+      - name: Create staging
+        if: github.ref == 'refs/heads/main'
+        run: docker buildx imagetools create -t ${{ secrets.DOCKERHUB_USERNAME }}/jzsearch:staging ${{ secrets.DOCKERHUB_USERNAME }}/jzsearch:latest
+
+      - name: Generate summary
+        run: |
+          echo "Tag: ${{ github.sha }}" >> $GITHUB_STEP_SUMMARY
+
+      - name: Upload reports if failed
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: search-reports
+          path: |
+            **/build/reports/
+            **/build/test-results/
+
+      - name: Upload coverage if passed
+        if: success()
+        uses: actions/upload-artifact@v4
+        with:
+          name: search-coverage
+          path: |
+            **/build/reports/jacoco/

.github/workflows/search.yaml

@@ -1,75 +1,3 @@
 plugins {
-    alias(libs.plugins.kotlin.jvm)
-    alias(libs.plugins.ktor)
-    alias(libs.plugins.kotlinter)
-    alias(libs.plugins.detekt)
     alias(libs.plugins.versions)
-    alias(libs.plugins.serialization)
-    jacoco
 }
-
-group = "no.java.conf"
-version = "0.0.1"
-
-application {
-    mainClass.set("io.ktor.server.cio.EngineMain")
-}
-
-kotlin {
-    jvmToolchain(22)
-
-    compilerOptions {
-        freeCompilerArgs = listOf("-Xcontext-receivers")
-    }
-}
-
-repositories {
-    mavenCentral()
-    maven("https://maven.tryformation.com/releases") {
-        content {
-            includeGroup("com.jillesvangurp")
-        }
-    }
-}
-
-dependencies {
-    implementation(libs.ktor.server.core)
-    implementation(libs.ktor.server.host.common)
-    implementation(libs.ktor.server.status.pages)
-    implementation(libs.ktor.server.cio)
-    implementation(libs.ktor.server.content.negotiation)
-    implementation(libs.logback.classic)
-    implementation(libs.bundles.monitoring)
-    implementation(libs.bundles.serialization)
-    implementation(libs.bundles.ktor.client)
-    implementation(libs.arrow.core)
-    implementation(libs.kotlin.logging)
-    implementation(libs.bundles.search)
-    testImplementation(libs.bundles.test)
-}
-
-tasks.shadowJar {
-    dependsOn(":frontend:npm_run_generate")
-
-    from("frontend/.output/public") {
-        into("static")
-    }
-
-    archiveFileName.set("history.jar")
-}
-
-tasks.jar {
-    enabled = false
-}
-
-tasks.withType<Test>().configureEach {
-    useJUnitPlatform()
-}
-
-tasks.test {
-    finalizedBy(tasks.jacocoTestReport)
-}
-
-tasks.jacocoTestReport {
-    dependsOn(tasks.test)
-}

build.gradle.kts

@@ -0,0 +1,12 @@
+FROM node:22-alpine AS build
+
+WORKDIR /app
+COPY . .
+RUN npm install
+RUN npm run build
+
+FROM node:22-alpine AS deploy
+
+WORKDIR /app
+COPY --from=build /app/.output/ /app
+CMD ["node", "/app/server/index.mjs"]

frontend/Dockerfile

@@ -0,0 +1,6 @@
+FROM eclipse-temurin:22-jre
+
+RUN mkdir -p /opt/app
+COPY build/libs/search.jar /opt/app
+CMD ["java", "-jar", "/opt/app/search.jar"]
+++

frontend/build.gradle.kts

@@ -0,0 +1,69 @@
+plugins {
+    alias(libs.plugins.kotlin.jvm)
+    alias(libs.plugins.ktor)
+    alias(libs.plugins.kotlinter)
+    alias(libs.plugins.detekt)
+    alias(libs.plugins.versions)
+    alias(libs.plugins.serialization)
+    jacoco
+}
+
+group = "no.java.conf"
+version = "0.0.1"
+
+application {
+    mainClass.set("io.ktor.server.cio.EngineMain")
+}
+
+kotlin {
+    jvmToolchain(22)
+
+    compilerOptions {
+        freeCompilerArgs = listOf("-Xcontext-receivers")
+    }
+}
+
+repositories {
+    mavenCentral()
+    maven("https://maven.tryformation.com/releases") {
+        content {
+            includeGroup("com.jillesvangurp")
+        }
+    }
+}
+
+dependencies {
+    implementation(libs.ktor.server.core)
+    implementation(libs.ktor.server.host.common)
+    implementation(libs.ktor.server.status.pages)
+    implementation(libs.ktor.server.cio)
+    implementation(libs.ktor.server.content.negotiation)
+    implementation(libs.logback.classic)
+    implementation(libs.bundles.monitoring)
+    implementation(libs.bundles.serialization)
+    implementation(libs.bundles.ktor.client)
+    implementation(libs.arrow.core)
+    implementation(libs.kotlin.logging)
+    implementation(libs.bundles.search)
+    testImplementation(libs.bundles.test)
+}
+
+tasks.shadowJar {
+    archiveFileName.set("search.jar")
+}
+
+tasks.jar {
+    enabled = false
+}
+
+tasks.withType<Test>().configureEach {
+    useJUnitPlatform()
+}
+
+tasks.test {
+    finalizedBy(tasks.jacocoTestReport)
+}
+
+tasks.jacocoTestReport {
+    dependsOn(tasks.test)
+}