Skip to content

Commit

Permalink
build: sbt native client broken, use regular sbt
Browse files Browse the repository at this point in the history
  • Loading branch information
johanandren committed Nov 8, 2024
1 parent 709c310 commit ded590c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,22 +56,22 @@ jobs:

- name: Run javafmt checks
run: |
sbt --client javafmtCheckAll || \
sbt javafmtCheckAll || \
{ echo "[error] Code not formatted prior to commit. Run 'sbt javafmtAll' then commit the reformatted code."; false; }
- name: Run header checks
run: |
sbt --client headerCheckAll || \
sbt headerCheckAll || \
{ echo "[error] Code missing headers prior to commit. Run 'sbt headerCreateAll' then commit the updated code."; false; }
- name: Run scalafmt checks
run: |
sbt --client "scalafmtCheckAll; scalafmtSbtCheck" || \
sbt "scalafmtCheckAll; scalafmtSbtCheck" || \
{ echo "[error] Code not formatted prior to commit. Run 'sbt scalafmtAll scalafmtSbt' then commit the reformatted code."; false; }
- name: sbt shutdown
run: |
sbt --client shutdown
sbt shutdown
publish-local:
name: Build and publish artifacts and plugins locally
Expand Down Expand Up @@ -766,9 +766,9 @@ jobs:
cd samples/${DIR}
echo "Running sbt on ${DIR} with SDK version: '$SDK_VERSION'"
echo "==== Testing with Scala 2.13 ===="
sbt --client -Dkalix-sdk.version=$SDK_VERSION '++2.13.14! Test/compile'
sbt -Dkalix-sdk.version=$SDK_VERSION '++2.13.14! Test/compile'
echo "==== Testing with Scala 3 ===="
sbt --client -Dkalix-sdk.version=$SDK_VERSION 'clean; ++3.3.3! Test/compile'
sbt -Dkalix-sdk.version=$SDK_VERSION 'clean; ++3.3.3! Test/compile'
- name: sbt test
if: matrix.test
Expand All @@ -780,9 +780,9 @@ jobs:
cd samples/${DIR}
${PRE_CMD}
echo "==== Testing with Scala 2.13 ===="
sbt --client -Dkalix-sdk.version=$SDK_VERSION '++2.13.14! test'
sbt -Dkalix-sdk.version=$SDK_VERSION '++2.13.14! test'
echo "==== Testing with Scala 3 ===="
sbt --client -Dkalix-sdk.version=$SDK_VERSION 'clean; ++3.3.3! test'
sbt -Dkalix-sdk.version=$SDK_VERSION 'clean; ++3.3.3! test'
- name: rm & sbt Test/compile
env:
Expand All @@ -792,6 +792,6 @@ jobs:
cd samples/${DIR}
echo "==== Verifying that generated unmanaged sources compile with Scala 2.13 ===="
rm -rf src/main/scala src/test/scala src/it/scala
sbt --client -Dkalix-sdk.version=$SDK_VERSION '++2.13.14! Test/compile'
sbt -Dkalix-sdk.version=$SDK_VERSION '++2.13.14! Test/compile'
echo "==== Verifying that generated unmanaged sources compile with Scala 3 ===="
sbt --client -Dkalix-sdk.version=$SDK_VERSION 'clean; ++3.3.3! Test/compile'
sbt -Dkalix-sdk.version=$SDK_VERSION 'clean; ++3.3.3! Test/compile'
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ jobs:
PGP_SECRET: ${{ secrets.PGP_SECRET }}
PUBLISH_USER: ${{ secrets.PUBLISH_USER }}
PUBLISH_PASSWORD: ${{ secrets.PUBLISH_PASSWORD }}
run: sbt --client +publishSigned
run: sbt +publishSigned

- name: sbt publishM2
run: sbt --client +publishM2
run: sbt +publishM2

- name: mvn deploy
run: |-
Expand Down

0 comments on commit ded590c

Please sign in to comment.