From f37502dd09d56724744eee13cfc18dc909dd6f49 Mon Sep 17 00:00:00 2001 From: outductor Date: Thu, 4 Jan 2024 15:58:48 +0900 Subject: [PATCH 1/2] prepare for assembly v2 --- .github/workflows/publish-assembled-jar.yml | 2 +- .github/workflows/pull-request.yml | 2 +- prepare-docker.bat | 1 + prepare-docker.sh | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish-assembled-jar.yml b/.github/workflows/publish-assembled-jar.yml index 6ec8d62..ee62805 100644 --- a/.github/workflows/publish-assembled-jar.yml +++ b/.github/workflows/publish-assembled-jar.yml @@ -14,7 +14,7 @@ jobs: submodules: recursive - name: Build artifact - run: sbt assembly + run: mkdir -p target/build && ./sbt assembly - name: Release uses: softprops/action-gh-release@v1 diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 8f5382f..f9d26cf 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -14,4 +14,4 @@ jobs: submodules: recursive - name: Build artifact - run: sbt assembly + run: mkdir -p target/build && ./sbt assembly diff --git a/prepare-docker.bat b/prepare-docker.bat index 7f621f1..385d1fc 100644 --- a/prepare-docker.bat +++ b/prepare-docker.bat @@ -1,5 +1,6 @@ call rd /s /q target\build +mkdir target\build call sbt assembly || goto :onerror REM https://stackoverflow.com/a/23812179 diff --git a/prepare-docker.sh b/prepare-docker.sh index f0fed73..80aacc5 100644 --- a/prepare-docker.sh +++ b/prepare-docker.sh @@ -5,7 +5,7 @@ build_image() { rm -r target/build || true - ./sbt assembly + mkdir -p target/build && ./sbt assembly cp -n docker/spigot/eula.txt docker/spigot/serverfiles/eula.txt || true From 3209fcb74d79fe557b2753f1dc215b544d82009d Mon Sep 17 00:00:00 2001 From: outductor Date: Thu, 4 Jan 2024 16:00:13 +0900 Subject: [PATCH 2/2] update sbt assembly --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 26ac3e5..d83c883 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.5")