change CI

Signed-off-by: root <root@adijethinkbook.>
Signed-off-by: Adije Shen <[email protected]>

Author: AdijeShen

.github/workflows/java.yml

@@ -33,11 +33,7 @@ jobs:
           path: liboqs
           ref: main
       - name: Build liboqs
-<<<<<<< HEAD
         run: mkdir build && cd build && cmake .. -G"Ninja" -DOQS_BUILD_ONLY_LIB=ON && ninja install
-=======
-        run: mkdir build && cd build && cmake .. -G"Ninja" -DBUILD_SHARED_LIBS=ON -DOQS_BUILD_ONLY_LIB=ON && ninja install
->>>>>>> upstream/master
         working-directory: liboqs
       - name: Resolve all maven project dependencies
         run: mvn dependency:go-offline
@@ -66,30 +62,34 @@ jobs:
           path: liboqs
           ref: main
       - name: Install liboqs dependencies
-        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
+        run: |
+          env HOMEBREW_NO_AUTO_UPDATE=1 brew install ninja openssl@3
+          echo "OPENSSL_ROOT_DIR=$(brew --prefix openssl@3)" >> $GITHUB_ENV
+          export LDFLAGS="-L$(brew --prefix openssl@3)/lib"
+          echo "LDFLAGS=$LDFLAGS"
       - name: Build liboqs
-<<<<<<< HEAD
         run: mkdir build && cd build && cmake .. -G"Ninja" -DOQS_BUILD_ONLY_LIB=ON && sudo ninja install
-=======
-        run: mkdir build && cd build && cmake .. -G"Ninja" -DBUILD_SHARED_LIBS=ON -DOQS_BUILD_ONLY_LIB=ON && sudo ninja install
->>>>>>> upstream/master
         working-directory: liboqs
       - name: Resolve all maven project dependencies
         run: mvn dependency:go-offline
       - name: Build liboqs-java and run tests
-        run: export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:/usr/local/lib" && mvn -P macosx package
+        run: |
+          export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:/usr/local/lib"
+          export OPENSSL_PATH=$(brew --prefix openssl@3)/lib
+          mvn -P macosx "-Dlinker.end.option=/usr/local/lib/liboqs.a -L$OPENSSL_PATH -lcrypto" 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
-<<<<<<< HEAD
 
   windows:
     needs: workflowcheck
     runs-on: windows-latest
     steps:
+      - name: Checkout liboqs-java
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4
+
       - name: Install MSYS2
         uses: msys2/setup-msys2@v2
         with:
@@ -101,15 +101,12 @@ jobs:
             make
 
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '8'
           cache: 'maven'
 
-      - name: Checkout liboqs-java
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4
-
       - name: Checkout liboqs main
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4
         with:
@@ -132,12 +129,11 @@ jobs:
       - name: Build liboqs-java and run tests
         run: |
           $env:Path += ";$env:GITHUB_WORKSPACE\liboqs\build\lib"
-          mvn -P windows -Dliboqs.include.dir="$env:GITHUB_WORKSPACE\liboqs\build\include" -Dliboqs.lib.dir="$env:GITHUB_WORKSPACE\liboqs\build\lib" package
-
+          $includeDir = "$env:GITHUB_WORKSPACE\liboqs\build\include"
+          $libDir = "$env:GITHUB_WORKSPACE\liboqs\build\lib"
+          mvn -Pwindows "-Dliboqs.include.dir=$includeDir" "-Dliboqs.lib.dir=$libDir" 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
-=======
->>>>>>> upstream/master