chore: remote FTL root POM; ftl-runtime POM is standalone

fixes #1019
block · Mar 14, 2024 · f223c54 · f223c54
1 parent 39c50b6
commit f223c54
Show file tree

Hide file tree

Showing 8 changed files with 372 additions and 464 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Build Cache
         uses: ./.github/actions/build-cache
       - name: Test
-        run: mvn test --batch-mode
+        run: mvn -f kotlin-runtime/ftl-runtime -B test
   test:
     name: Test Go
     runs-on: ubuntu-latest

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -112,9 +112,9 @@ jobs:
           cache: "maven"
       - name: Publish JARs # Snapshots are published first, then the tagged release
         run: |
-          mvn -U -B clean deploy -P release
-          mvn -B versions:set -DnewVersion="$(git describe --tags --abbrev=0 | cut -c2-)" -DprocessAllModules -DgenerateBackupPoms=false
-          mvn -U -B clean deploy -P release
+          mvn -f kotlin-runtime/ftl-runtime -U -B clean deploy -P release
+          mvn -f kotlin-runtime/ftl-runtime -B versions:set -DnewVersion="$(git describe --tags --abbrev=0 | cut -c2-)" -DprocessAllModules -DgenerateBackupPoms=false
+          mvn -f kotlin-runtime/ftl-runtime -U -B clean deploy -P release
           git clean -f ./*.flattened_pom.xml
         env:
           SIGN_KEY_PASS: ${{ secrets.GPG_PASSPHRASE }}

diff --git a/.github/workflows/writecache.yml b/.github/workflows/writecache.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Rebuild All
         run: bit
       - name: Download Maven Dependencies
-        run: mvn dependency:resolve --batch-mode
+        run: mvn -f kotlin-runtime/ftl-runtime dependency:resolve --batch-mode
       - name: Download Go Dependencies
         run: go mod download -x
       - id: find-go-build-cache

diff --git a/Bitfile b/Bitfile
@@ -27,7 +27,7 @@ PROTO_OUT = backend/protos/xyz/block/ftl/v1/ftlv1connect/ftl.connect.go \
 COMMON_LOG_IN = internal/log/api.go
 COMMON_LOG_OUT = internal/log/log_level_string.go
 
-KT_RUNTIME_IN = kotlin-runtime/ftl-runtime/**/*.{kt,kts} pom.xml kotlin-runtime/ftl-runtime/**/pom.xml
+KT_RUNTIME_IN = kotlin-runtime/ftl-runtime/**/*.{kt,kts} kotlin-runtime/ftl-runtime/**/pom.xml
 KT_RUNTIME_OUT = kotlin-runtime/ftl-runtime/target/ftl-runtime-1.0-SNAPSHOT.jar
 KT_RUNTIME_RUNNER_TEMPLATE_OUT = build/template/ftl/jars/ftl-runtime.jar
 
@@ -113,9 +113,8 @@ kotlin-runtime/external-module-template.zip: kotlin-runtime/external-module-temp
 %{KT_RUNTIME_OUT}: %{KT_RUNTIME_IN} %{PROTO_IN}
   # TODO: Figure out how to make Maven build completely offline. Bizarrely "-o" does not do this.
   build:
-    mvn -B -N install
-    mvn -Dmaven.test.skip=true -B -pl :ftl-runtime install
-  +clean: mvn -B -pl :ftl-runtime clean
+    mvn -f kotlin-runtime/ftl-runtime -Dmaven.test.skip=true -B install
+  +clean: mvn -f kotlin-runtime/ftl-runtime -B clean
 
 %(dirname %{KT_RUNTIME_RUNNER_TEMPLATE_OUT})%:
   build: install -m 0700 -d %{OUT}

diff --git a/Dockerfile.controller b/Dockerfile.controller
@@ -10,7 +10,7 @@ WORKDIR /src
 
 # Seed some of the most common tools - this will be cached
 RUN go version
-RUN mvn -B --version
+RUN mvn -f kotlin-runtime/ftl-runtime -B --version
 
 # Download Go dependencies separately so Docker will cache them
 COPY go.mod go.sum ./

diff --git a/Dockerfile.runner b/Dockerfile.runner
@@ -12,7 +12,7 @@ RUN hermit install openjre-18.0.2.1_1
 RUN hermit uninstall openjre
 RUN hermit install jbr
 RUN go version
-RUN mvn -B --version
+RUN mvn -f kotlin-runtime/ftl-runtime -B --version
 
 WORKDIR /src