Skip to content

Commit

Permalink
chore: disable kotlin tests/releases (#1365)
Browse files Browse the repository at this point in the history
don't build kotlin when running just build-all

follow up from #1364 with stuff that was missed
  • Loading branch information
worstell authored May 2, 2024
1 parent 4dc44df commit 28c1552
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ jobs:
uses: cashapp/activate-hermit@v1
- name: Build Cache
uses: ./.github/actions/build-cache
- name: Build Kotlin
run: just build-kt-runtime
- name: Docker Compose
run: docker compose up -d --wait
- name: Test
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/writecache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ jobs:
run: just init-db
- name: Rebuild All
run: just build-all
- name: Download Maven Dependencies
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
Expand Down
10 changes: 5 additions & 5 deletions Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dev *args:
watchexec -r -e go -e sql -f sqlc.yaml -- "just build-sqlc && ftl dev {{args}}"

# Build everything
build-all: build-frontend build-generate build-kt-runtime build-protos build-sqlc build-zips
build-all: build-frontend build-generate build-protos build-sqlc build-zips
@just build ftl ftl-controller ftl-runner ftl-initdb

# Run "go generate" on all packages
Expand Down Expand Up @@ -86,11 +86,11 @@ package-extension: build-extension
publish-extension: package-extension
@cd extensions/vscode && vsce publish

# Build the Kotlin runtime (if necessary)
# Kotlin runtime is temporarily disabled; these instructions create a dummy zip in place of the kotlin runtime jar for
# the runner.
build-kt-runtime:
@mk {{KT_RUNTIME_OUT}} : kotlin-runtime/ftl-runtime -- mvn -f kotlin-runtime/ftl-runtime -Dmaven.test.skip=true -B install
@mk {{KT_RUNTIME_RUNNER_TEMPLATE_OUT}} : {{KT_RUNTIME_OUT}} -- "mkdir -p $(dirname {{KT_RUNTIME_RUNNER_TEMPLATE_OUT}}) && install -m 0600 {{KT_RUNTIME_OUT}} {{KT_RUNTIME_RUNNER_TEMPLATE_OUT}}"
@mk {{RUNNER_TEMPLATE_ZIP}} : {{KT_RUNTIME_RUNNER_TEMPLATE_OUT}} -- "cd build/template && zip -q --symlinks -r ../../{{RUNNER_TEMPLATE_ZIP}} ."
@mkdir -p build/template/ftl && touch build/template/ftl/temp.txt
@cd build/template && zip -q --symlinks -r ../../{{RUNNER_TEMPLATE_ZIP}} .

# Install Node dependencies
npm-install:
Expand Down

0 comments on commit 28c1552

Please sign in to comment.