wip2

pfeodrippe · Jul 22, 2024 · a19a2a3 · a19a2a3
1 parent 4f126a8
commit a19a2a3
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,12 +7,17 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     strategy:
-      fail-fast: false
+      fail-fast: true
 
     steps:
       - uses: actions/checkout@v4
       - uses: mlugg/setup-zig@v1
 
+      - name: install jextract
+        run: |
+          wget -O jextract.tar.gz https://download.java.net/java/early_access/jextract/22/5/openjdk-22-jextract+5-33_linux-x64_bin.tar.gz
+          tar -xvzf jextract.tar.gz
+
       - name: install bake
         run: |
           git clone https://github.com/SanderMertens/bake
@@ -21,26 +26,29 @@ jobs:
 
       - name: compile and jextract native modules
         run: |
-          bake --strict
+          bin/ci.sh
 
   build-macos:
     runs-on: macOS-latest
     timeout-minutes: 30
     strategy:
-      fail-fast: false
+      fail-fast: true
 
     steps:
       - uses: actions/checkout@v4
       - uses: mlugg/setup-zig@v1
 
+      - name: install jextract
+        run: |
+          wget -O jextract.tar.gz https://download.java.net/java/early_access/jextract/22/5/openjdk-22-jextract+5-33_macos-aarch64_bin.tar.gz
+          tar -xvzf jextract.tar.gz
+
       - name: install bake
         run: |
           git clone https://github.com/SanderMertens/bake
           make -C bake/build-$(uname)
           bake/bake setup
 
-      # TODO install zig
-
       - name: compile and jextract native modules
         run: |
           bin/ci.sh
@@ -49,13 +57,18 @@ jobs:
     runs-on: windows-latest
     timeout-minutes: 30
     strategy:
-      fail-fast: false
+      fail-fast: true
 
     steps:
       - uses: actions/checkout@v4
       - uses: ilammy/msvc-dev-cmd@v1
       - uses: mlugg/setup-zig@v1
 
+      - name: install jextract
+        run: |
+          wget -O jextract.tar.gz https://download.java.net/java/early_access/jextract/22/5/openjdk-22-jextract+5-33_windows-x64_bin.tar.gz
+          tar -xvzf jextract.tar.gz
+
       - name: install bake
         run: |
           git clone https://github.com/SanderMertens/bake
@@ -65,4 +78,4 @@ jobs:
           ./bake setup --local
 
       - name: compile and jextract native modules
-        run: bake/bake --strict --cfg release
+        run: bin/ci.sh
diff --git a/bin/ci.sh b/bin/ci.sh
@@ -3,4 +3,8 @@
 set -ex
 
 git submodule update --init --recursive
+
+export VYBE_JEXTRACT=jextract-22/bin/jextract
 bin/jextract-libs.sh
+
+clj -T:build compile-app