From dc6fdca849cd4a075fdf5d590407a86083168316 Mon Sep 17 00:00:00 2001 From: Peter Rindal Date: Fri, 23 Aug 2024 11:09:48 -0700 Subject: [PATCH] ci debug --- .github/workflows/build-test.yml | 132 +++++++++++++++---------------- thirdparty/getRelic.cmake | 2 +- thirdparty/getSodium.cmake | 1 - 3 files changed, 67 insertions(+), 68 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 403e5c1..9a78e33 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -83,68 +83,68 @@ jobs: # ./out/main # rm -rf out/ # cd ../.. - # - ## This workflow contains a single job called "build" - #build-osx: - # # 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 - # - # # Runs a set of commands using the runners shell - # - name: build cryptoTools - # 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 - # - # - # - 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 ../.. - # + + # This workflow contains a single job called "build" + build-osx: + # 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 + + # Runs a set of commands using the runners shell + - name: build cryptoTools + run: python3 build.py --par=4 -D ENABLE_RELIC=ON -D ENABLE_BOOST=OFF -D ENABLE_SSE=OFF + + - 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 ../.. + # This workflow contains a single job called "build" build-osx-sodium: @@ -166,10 +166,10 @@ jobs: run: python3 build.py -D ENABLE_SODIUM=ON -D ENABLE_SSE=OFF -D CRYPTO_TOOLS_STD_VER=17 -DFETCH_SODIUM=ON - # - name: list - # run: | - # ls out/libsodium/ - # cat out/libsodium/config.log + - name: list + run: | + ls out/libsodium/ + cat out/libsodium/config.log diff --git a/thirdparty/getRelic.cmake b/thirdparty/getRelic.cmake index 91def9d..0843d7d 100644 --- a/thirdparty/getRelic.cmake +++ b/thirdparty/getRelic.cmake @@ -3,7 +3,7 @@ if(NOT DEFINED RELIC_GIT_REPOSITORY) set(RELIC_GIT_REPOSITORY https://github.com/relic-toolkit/relic.git ) endif() if(NOT DEFINED RELIC_GIT_TAG) - set(RELIC_GIT_TAG "0.6.0" ) + set(RELIC_GIT_TAG "12cf3d6f1a64c2309531e7eb7a6f24a6da363096" ) endif() set(GIT_REPOSITORY ${RELIC_GIT_REPOSITORY}) set(GIT_TAG ${RELIC_GIT_TAG}) diff --git a/thirdparty/getSodium.cmake b/thirdparty/getSodium.cmake index 4feb025..a8cd43f 100644 --- a/thirdparty/getSodium.cmake +++ b/thirdparty/getSodium.cmake @@ -74,7 +74,6 @@ if(NOT SODIUM_FOUND) run(NAME "Autogen" CMD ${AUTOGEN_CMD} WD ${CLONE_DIR}) run(NAME "Configure" CMD ${CONFIGURE_CMD} WD ${CLONE_DIR}) - run(NAME "Configure" CMD ${CONFIGURE_CMD} WD ${CLONE_DIR}) run(NAME "Build" CMD ${BUILD_CMD} WD ${CLONE_DIR}) run(NAME "Install" CMD ${INSTALL_CMD} WD ${CLONE_DIR}) run(NAME "Install2" CMD "mkdir" "-p" "${OC_THIRDPARTY_INSTALL_PREFIX}/lib/cmake/libsodium" WD ${CLONE_DIR})