roll back

PRQL · Feb 28, 2023 · 152c822 · 152c822
1 parent 6e4401d
commit 152c822
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/.github/workflows/build-java.yaml b/.github/workflows/build-java.yaml
@@ -34,7 +34,7 @@ jobs:
             # https://adoptium.net/supported-platforms/
             jdk: 11
           - os: ubuntu-latest
-            target: x86_64-unknown-linux-gnu
+            target: x86_64-unknown-linux-musl
             suffix: ".so"
             jdk: 8
           - os: windows-latest
@@ -50,6 +50,13 @@ jobs:
         with:
           distribution: "temurin"
           java-version: ${{ matrix.jdk }}
+      - name: Install
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          override: true
+          toolchain: stable
+          target: ${{ matrix.target }}
       - name: Build
         #uses: richb-hanover/cargo@v1.1.0
         uses: actions-rs/cargo@v1

diff --git a/.github/workflows/test-java.yaml b/.github/workflows/test-java.yaml
@@ -25,7 +25,7 @@ jobs:
             # https://adoptium.net/supported-platforms/
             jdk: 11
           - os: ubuntu-latest
-            target: x86_64-unknown-linux-gnu
+            target: x86_64-unknown-linux-musl
             jdk: 8
           - os: windows-latest
             target: x86_64-pc-windows-msvc
@@ -40,6 +40,13 @@ jobs:
           distribution: "temurin"
           java-version: ${{ matrix.jdk }}
           cache: "maven"
+      - name: Install
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          override: true
+          toolchain: stable
+          target: ${{ matrix.target }}
       - name: Build prqlc
         #uses: richb-hanover/cargo@v1.1.0
         uses: actions-rs/cargo@v1

diff --git a/prql-java/prql-api/src/main/java/org/prqllang/internal/Utils.java b/prql-java/prql-api/src/main/java/org/prqllang/internal/Utils.java
@@ -47,7 +47,7 @@ static final class Defaults {
             } else if (osName.contains("windows")) {
                 LIB_PATH = (is64bit ? "x86_64" : "x86") + "-pc-windows-msvc";
             } else { // linux
-                LIB_PATH = (is64bit ? "x86_64" : "x86") + "-unknown-linux-gnu";
+                LIB_PATH = (is64bit ? "x86_64" : "x86") + "-unknown-linux-musl";
             }
         }