From 7f42da2fa311af51f7f0e7612f735d580e982ad7 Mon Sep 17 00:00:00 2001
From: Andrew Wells <130512013+andrewmwells-amazon@users.noreply.github.com>
Date: Fri, 29 Mar 2024 09:27:43 -0700
Subject: [PATCH] fix downstream java build (#762)

Signed-off-by: Andrew Wells <anmwells@amazon.com>
---
 .github/workflows/build_downstream_deps.yml | 37 ++++++++++++++-------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build_downstream_deps.yml b/.github/workflows/build_downstream_deps.yml
index a61bfa3a5..5ab404cdb 100644
--- a/.github/workflows/build_downstream_deps.yml
+++ b/.github/workflows/build_downstream_deps.yml
@@ -54,15 +54,23 @@ jobs:
         run: source ~/.profile && source ../set_env_vars.sh && RUSTFLAGS="--cfg=fuzzing -D warnings" cargo build
 
   cedar-java:
-    name: CedarJava
-    runs-on: ubuntu-latest
     needs: get-branch-name
     strategy:
       matrix:
-        toolchain:
-          - stable
+        os: [ubuntu-latest, macos-14]
+        include:
+          - os: ubuntu-latest
+            name: Build on Linux
+            zigInstall: sudo snap install zig --beta --classic
+          - os: macos-14
+            name: Build on macOS
+            zigInstall: brew install zig
+    runs-on: ${{ matrix.os }}
+    name: ${{ matrix.name }}
     steps:
       - run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }}
+      - name: Install Zig
+        run: ${{ matrix.zigInstall }}
       - name: Checkout cedar-java
         uses: actions/checkout@v3
         with:
@@ -73,16 +81,21 @@ jobs:
         uses: actions/checkout@v3
         with:
           path: cedar-java/cedar
-      - name: configure cedar-java
-        working-directory: cedar-java/CedarJava
-        shell: bash
-        run: bash config.sh run_int_tests
-      - name: build cedar-java/CedarJavaFFI
+      - name: Check FFI Formatting
         working-directory: cedar-java/CedarJavaFFI
-        run: RUSTFLAGS="-D warnings" cargo build
-      - name: build cedar-java/CedarJava
+        run: cargo fmt --all --check
+      - name: Setup Java JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'corretto'
+          cache: 'gradle'
+      - name: Build FFI and Java Libraries
+        working-directory: cedar-java/CedarJava
+        run: ./gradlew build
+      - name: Generate Java Documentation
         working-directory: cedar-java/CedarJava
-        run: export MUST_RUN_CEDAR_INTEGRATION_TESTS=1 && ./gradlew build
+        run: ./gradlew javadoc
 
   build-cedar-examples-hello-world:
     needs: get-branch-name