diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index edcdfa5..0cc3589 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -87,7 +87,7 @@ jobs: # This workflow contains a single job called "build" build-osx: # The type of runner that the job will run on - runs-on: macos-latest + runs-on: macos-14 # Steps represent a sequence of tasks that will be executed as part of the job steps: @@ -97,14 +97,8 @@ jobs: submodules: recursive # Runs a set of commands using the runners shell - - name: build boost - run: python3 build.py --setup --boost --par=4 - - - name: build relic - run: python3 build.py --setup --relic --par=4 - - name: build cryptoTools - run: python3 build.py --par=4 -D ENABLE_RELIC=ON -D ENABLE_SSE=OFF -D CRYPTO_TOOLS_STD_VER=17 + run: python3 build.py --par=4 -D ENABLE_RELIC=ON -D ENABLE_BOOST=ON -D ENABLE_SSE=OFF - name: unit tests run: ./out/build/osx/frontend_cryptoTools/frontend_cryptoTools -u @@ -151,6 +145,66 @@ jobs: rm -rf out/ cd ../.. + + # This workflow contains a single job called "build" + build-osx-sodium: + # The type of runner that the job will run on + runs-on: macos-14 + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + with: + submodules: recursive + + - name: build cryptoTools + run: python3 build.py -D ENABLE_SODIUM=ON -D ENABLE_SSE=OFF -D CRYPTO_TOOLS_STD_VER=17 + + - name: unit tests + run: ./out/build/osx/frontend_cryptoTools/frontend_cryptoTools -u + + + - name: find source tree + run: | + cd tests_cryptoTools/cmakeTests + cmake -S . -B out/ -DCMAKE_BUILD_TYPE=Release -D CMAKE_PREFIX_PATH=../../ + cmake --build out/ + ./out/main + rm -rf out/ + cd ../.. + + - name: hint test + run: | + cd tests_cryptoTools/cmakeTests + cmake -S . -B out/ -D CRYPTOTOOLS_HINT=../.. + cmake --build out/ + ./out/main + rm -rf out/ + cd ../.. + + - name: install prefix test + run: | + python3 build.py --setup --boost --relic --install=~/install + python3 build.py --install=~/install + cd tests_cryptoTools/cmakeTests + cmake -S . -B out/ -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=~/install + cmake --build out/ + ./out/main + rm -rf out/ + cd ../.. + + + - name: install test + run: | + python3 build.py --setup --boost --relic --install --sudo + python3 build.py --install --sudo + cd tests_cryptoTools/cmakeTests + cmake -S . -B out/ -DCMAKE_BUILD_TYPE=Release + cmake --build out/ + ./out/main + rm -rf out/ + cd ../.. build-windows: # The type of runner that the job will run on diff --git a/thirdparty/getSodium.cmake b/thirdparty/getSodium.cmake index e6cf026..1099a39 100644 --- a/thirdparty/getSodium.cmake +++ b/thirdparty/getSodium.cmake @@ -1,7 +1,7 @@ -set(GIT_REPOSITORY https://github.com/osu-crypto/libsodium.git) -set(GIT_TAG "4e825a68baebdf058543f29762c73c17b1816ec0" ) +set(GIT_REPOSITORY https://github.com/ladnir/libsodium.git) +set(GIT_TAG "884b4d3ab22e905fad69e5f8add35a50be82c2ba" ) set(CLONE_DIR "${OC_THIRDPARTY_CLONE_DIR}/libsodium") set(BUILD_DIR "${CLONE_DIR}/build/${OC_CONFIG}")