reenable(pkl,linux/x86-64)

try and do it with vendoring (if it passes tests)
This commit is contained in:
Jacob Heider 2024-06-18 00:03:42 -04:00 committed by Jacob Heider
parent 08b8bdbfed
commit b3a3089b0d

View file

@ -5,9 +5,8 @@ distributable:
versions: versions:
github: apple/pkl github: apple/pkl
platforms: warnings:
- darwin - vendored-linux-x86-64
- linux/aarch64 # can't resolve the segfault on x86-64 (PIC, almost certainly)
companions: companions:
openjdk.org: '*' openjdk.org: '*'
@ -18,6 +17,8 @@ build:
linux: linux:
zlib.net: 1 zlib.net: 1
llvm.org: '*' llvm.org: '*'
linux/x86-64:
curl.se: '*'
script: script:
# graalvm fails to understand our compiler environment # graalvm fails to understand our compiler environment
- run: | - run: |
@ -55,20 +56,40 @@ build:
if: '>=0.26.0' if: '>=0.26.0'
working-directory: pkl-cli working-directory: pkl-cli
- ./gradlew -DreleaseBuild=true :pkl-cli:javaExecutable :pkl-cli:${SYS_NAME%os}ExecutableA${ARCH_NAME#a} - ./gradlew -DreleaseBuild=true $TARGETS
# vendor pkl-linux-x86-64 to deal with PIC issues
- run: curl -LO "https://github.com/apple/pkl/releases/download/{{version.tag}}/pkl-linux-amd64"
working-directory: pkl-cli/build/executable
- run: | - run: |
install -D jpkl {{prefix}}/bin/jpkl install -D jpkl {{prefix}}/bin/jpkl
install -D pkl-${SYS_NAME}-${ARCH_NAME} {{prefix}}/bin/pkl install -D pkl-${SYS_NAME}-${ARCH_NAME} {{prefix}}/bin/pkl
working-directory: pkl-cli/build/executable working-directory: pkl-cli/build/executable
skip: fix-patchelf
env: env:
darwin: TARGETS:
SYS_NAME: macos - :pkl-cli:javaExecutable
linux: linux/x86-64:
SYS_NAME: linux SYS_NAME: linux
x86-64:
ARCH_NAME: amd64 ARCH_NAME: amd64
aarch64: # TARGETS:
# - :pkl-cli:linuxExecutableAmd64
linux/aarch64:
SYS_NAME: linux
ARCH_NAME: aarch64 ARCH_NAME: aarch64
TARGETS:
- :pkl-cli:linuxExecutableAarch64
darwin/aarch64:
SYS_NAME: macos
ARCH_NAME: aarch64
TARGETS:
- :pkl-cli:macExecutableAarch64
darwin/x86-64:
SYS_NAME: macos
ARCH_NAME: amd64
TARGETS:
- :pkl-cli:macExecutableAmd64
provides: provides:
- bin/jpkl - bin/jpkl