Skip to content

Commit

Permalink
Github Actions: Fix windows dependency download script.
Browse files Browse the repository at this point in the history
  • Loading branch information
Lymia committed Dec 19, 2023
1 parent 9f11fc9 commit 4afbacc
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
1 change: 0 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ libraryDependencies += "org.playframework" %% "play-json" % "3.0
libraryDependencies += "com.intellij" % "forms_rt" % "7.0.3"
libraryDependencies += "com.formdev" % "flatlaf" % "3.2.5"
libraryDependencies += "com.formdev" % "flatlaf-fonts-roboto" % "2.137"
libraryDependencies += "org.tukaani" % "xz" % "1.9"

// Build assembled jar
ThisBuild / assemblyMergeStrategy := {
Expand Down
1 change: 0 additions & 1 deletion project/builddeps.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@ addSbtPlugin("org.scalameta" % "sbt-native-image" % "0.3.2")
resolvers += "SpringSource" at "https://repository.springsource.com/maven/bundles/external"

libraryDependencies += "com.github.rjeschke" % "txtmark" % "0.13"
libraryDependencies += "org.tukaani" % "xz" % "1.9"
6 changes: 4 additions & 2 deletions scripts/ci/install-deps.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,13 @@ New-Item "target/deps/dl" -ItemType Directory -ea 0 -Verbose
if (-Not(Test-Path "target/deps/graalvm-win32" -PathType Container)) {
echo "Downloading GraalVM for Windows..."
Download-Dependency -Name "graalvm-win32.zip" -Uri "$GRAALVM_WIN32_URL" -Sha256 "$GRAALVM_WIN32_SHA"
Expand-Archive -Path "target/deps/dl/graalvm-win32.zip" -DestinationPath "target/deps/graalvm-win32"
Expand-Archive -Path "target/deps/dl/graalvm-win32.zip" -DestinationPath "target/deps/graalvm-win32-tmp"
Move-Item "target/deps/graalvm-win32-tmp/$GRAALVM_WIN32_DIR" "target/deps/graalvm-win32"
Remove-Item "target/deps/graalvm-win32-tmp"
}

# Install rcedit
if (-Not (Test-Path "target/deps/rcedit.exe" -PathType Container)) {
if (-Not (Test-Path "target/deps/rcedit.exe" -PathType Leaf)) {
echo "Downloading rcedit..."
Download-Dependency -Name "rcedit.exe" -Uri "$RCEDIT_URL" -Sha256 "$RCEDIT_SHA"
Copy-Item "target/deps/dl/rcedit.exe" "target/deps/rcedit.exe"
Expand Down

0 comments on commit 4afbacc

Please sign in to comment.