fixup! Add macOS job

Signed-off-by: Spencer Wilson <[email protected]>
open-quantum-safe · Jan 23, 2025 · 5ae00d8 · 5ae00d8
1 parent a17ad90
commit 5ae00d8
Showing 1 changed file with 40 additions and 40 deletions.
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
@@ -9,46 +9,46 @@ on:
     types: ["**"]
 
 jobs:
-  workflowcheck:
-    name: Check validity of GitHub workflows
-    runs-on: ubuntu-latest
-    container: openquantumsafe/ci-ubuntu-latest:latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4
-      - name: Ensure GitHub actions are valid
-        run: actionlint -shellcheck "" # run *without* shellcheck
-
-  linux:
-    needs: workflowcheck
-    runs-on: ubuntu-latest
-    container: openquantumsafe/ci-ubuntu-latest:latest
-    steps:
-      - name: Install dependencies
-        run: apt-get update && apt-get install -y default-jdk-headless
-      - name: Checkout liboqs-java
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4
-      - name: Checkout liboqs main
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4
-        with:
-          repository: open-quantum-safe/liboqs
-          path: liboqs
-          ref: main
-      - name: Build liboqs
-        run: mkdir build && cd build && cmake .. -G"Ninja" -DBUILD_SHARED_LIBS=ON -DOQS_BUILD_ONLY_LIB=ON && ninja install
-        working-directory: liboqs
-      - name: Resolve all maven project dependencies
-        run: mvn dependency:go-offline
-      - name: Build liboqs-java and run tests
-        run: export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib" && export JAVA_HOME=/usr/lib/jvm/default-java && mvn package
-      - name: Compile KEM, Signatures and Rand examples
-        run: |
-          javac -cp target/liboqs-java.jar examples/KEMExample.java &&
-          javac -cp target/liboqs-java.jar examples/SigExample.java &&
-          javac -cp target/liboqs-java.jar examples/RandExample.java
+  #  workflowcheck:
+  #    name: Check validity of GitHub workflows
+  #    runs-on: ubuntu-latest
+  #    container: openquantumsafe/ci-ubuntu-latest:latest
+  #    steps:
+  #      - name: Checkout code
+  #        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4
+  #      - name: Ensure GitHub actions are valid
+  #        run: actionlint -shellcheck "" # run *without* shellcheck
+  #
+  #  linux:
+  #    needs: workflowcheck
+  #    runs-on: ubuntu-latest
+  #    container: openquantumsafe/ci-ubuntu-latest:latest
+  #    steps:
+  #      - name: Install dependencies
+  #        run: apt-get update && apt-get install -y default-jdk-headless
+  #      - name: Checkout liboqs-java
+  #        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4
+  #      - name: Checkout liboqs main
+  #        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4
+  #        with:
+  #          repository: open-quantum-safe/liboqs
+  #          path: liboqs
+  #          ref: main
+  #      - name: Build liboqs
+  #        run: mkdir build && cd build && cmake .. -G"Ninja" -DBUILD_SHARED_LIBS=ON -DOQS_BUILD_ONLY_LIB=ON && ninja install
+  #        working-directory: liboqs
+  #      - name: Resolve all maven project dependencies
+  #        run: mvn dependency:go-offline
+  #      - name: Build liboqs-java and run tests
+  #        run: export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib" && export JAVA_HOME=/usr/lib/jvm/default-java && mvn package
+  #      - name: Compile KEM, Signatures and Rand examples
+  #        run: |
+  #          javac -cp target/liboqs-java.jar examples/KEMExample.java &&
+  #          javac -cp target/liboqs-java.jar examples/SigExample.java &&
+  #          javac -cp target/liboqs-java.jar examples/RandExample.java
 
   macos:
-    needs: workflowcheck
+    #needs: workflowcheck
     runs-on: macos-14
     steps:
       - name: Install Python
@@ -67,12 +67,12 @@ jobs:
         run: env HOMEBREW_NO_AUTO_UPDATE=1 brew install ninja && pip3 install --require-hashes --break-system-packages -r .github/workflows/requirements.txt
         working-directory: liboqs
       - name: Build liboqs
-        run: mkdir build && cd build && cmake .. -G"Ninja" -DBUILD_SHARED_LIBS=ON -DOQS_BUILD_ONLY_LIB=ON && ninja install
+        run: mkdir build && cd build && cmake .. -G"Ninja" -DBUILD_SHARED_LIBS=ON -DOQS_BUILD_ONLY_LIB=ON && sudo ninja install
         working-directory: liboqs
       - name: Resolve all maven project dependencies
         run: mvn dependency:go-offline
       - name: Build liboqs-java and run tests
-        run: mvn -p macos package
+        run: export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:/usr/local/lib" && mvn -P macosx package
       - name: Compile KEM, Signatures and Rand examples
         run: |
           javac -cp target/liboqs-java.jar examples/KEMExample.java &&