Fix build.

Summary: Test Plan:
quelgar · Apr 14, 2024 · d5f9683 · d5f9683
1 parent f1152c2
commit d5f9683
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml
@@ -53,9 +53,9 @@ jobs:
     - name: Run tests
       run: |
         if [ "$RUNNER_OS" == "Windows" ]; then
-          PATH=libuv-build/build/Debug:$PATH sbt "$SBT_NATIVE_COMPILE $SBT_NATIVE_LINK show nativeCompileOptions ; show nativeLinkingOptions ; test"
+          PATH=libuv-build/build/Debug:$PATH sbt "$SBT_NATIVE_CONFIG show nativeConfig ; test"
         else
-          sbt "$SBT_NATIVE_COMPILE $SBT_NATIVE_LINK show nativeCompileOptions ; show nativeLinkingOptions ; test"
+          sbt "$SBT_NATIVE_CONFIG $SBT_NATIVE_LINK show nativeConfig  ; test"
         fi
       shell: bash
 

diff --git a/build-windows.sh b/build-windows.sh
@@ -9,6 +9,4 @@ mkdir -p build
 (cd build && cmake ..)
 cmake --build build
 
-echo SBT_NATIVE_COMPILE="set nativeCompileOptions += \"--include-directory=$repo_dir/libuv-build/include\" ; " >> $GITHUB_ENV
-
-echo SBT_NATIVE_LINK="set nativeLinkingOptions += \"--library-directory=$repo_dir/libuv-build/build/Debug\" ; " >> $GITHUB_ENV
+echo SBT_NATIVE_CONFIG="set nativeConfig ~= (_.withCompileOptions(_ :+ \"--include-directory=$repo_dir/libuv-build/include\").withLinkingOptions(_ :+ \"--library-directory=$repo_dir/libuv-build/build/Debug\")) ; " >> $GITHUB_ENV