From d64e9f0b03fd3f672601dac8d79181f64ab91f37 Mon Sep 17 00:00:00 2001 From: Alejandro Cabeza Romero Date: Wed, 8 Apr 2026 18:37:39 +0200 Subject: [PATCH] Use standard lib extensions. --- .github/actions/compile-witness-generator/action.yml | 7 ++++++- .github/resources/witness-generator/Makefile | 7 ++++++- .github/workflows/build-circuits.yml | 8 ++++---- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/actions/compile-witness-generator/action.yml b/.github/actions/compile-witness-generator/action.yml index 6937e37..2bddaa1 100644 --- a/.github/actions/compile-witness-generator/action.yml +++ b/.github/actions/compile-witness-generator/action.yml @@ -45,6 +45,11 @@ runs: CIRCUIT_FILENAME="$(basename ${CIRCUIT_PATH})" CIRCUIT_FILESTEM="${CIRCUIT_FILENAME%.circom}" CIRCUIT_CPP_DIRNAME="${CIRCUIT_FILESTEM}_cpp" + if [ "${OS}" = "windows" ]; then + LIB_EXT=".lib" + else + LIB_EXT=".a" + fi { echo "CIRCUIT_DIRECTORY=${CIRCUIT_DIRECTORY}" @@ -54,7 +59,7 @@ runs: echo "CIRCUIT_CPP_PATH=${CIRCUIT_DIRECTORY}/${CIRCUIT_CPP_DIRNAME}" echo "WITNESS_GENERATOR_RESOURCES_PATH=${RESOURCES_PATH}/witness-generator" echo "BUNDLE_TRIPLET=${BUNDLE_TRIPLET}" - echo "LIB_NAME=libwitness_${CIRCUIT_FILESTEM}.a" + echo "LIB_NAME=libwitness_${CIRCUIT_FILESTEM}${LIB_EXT}" } >> "${GITHUB_OUTPUT}" - name: Generate ${{ inputs.circuit-name-display }} diff --git a/.github/resources/witness-generator/Makefile b/.github/resources/witness-generator/Makefile index 2627880..95dcb72 100644 --- a/.github/resources/witness-generator/Makefile +++ b/.github/resources/witness-generator/Makefile @@ -26,7 +26,12 @@ LIB_SRCS := calcwit.cpp fr.cpp $(PROJECT).cpp LIB_OBJS := $(LIB_SRCS:.cpp=.o) DEPS_HPP := circom.hpp calcwit.hpp fr.hpp BIN := $(PROJECT) -LIB := libwitness_$(PROJECT).a +ifeq ($(OS),windows) +LIB_EXT := .lib +else +LIB_EXT := .a +endif +LIB := libwitness_$(PROJECT)$(LIB_EXT) # ---- Linux (x86_64 and aarch64) ---- linux: CXXFLAGS=$(CXXFLAGS_COMMON) diff --git a/.github/workflows/build-circuits.yml b/.github/workflows/build-circuits.yml index 0d1d8bc..e89896f 100644 --- a/.github/workflows/build-circuits.yml +++ b/.github/workflows/build-circuits.yml @@ -856,16 +856,16 @@ jobs: mv verifier-${{ env.VERSION }}-${{ env.OS }}-${{ env.ARCH }}/verifier/verifier.exe "${BUNDLE_NAME}/verifier.exe" # Move witness libraries into their respective circuit directories - mv witness-generators/pol-artifact/libwitness_pol.a "${BUNDLE_NAME}/pol/" + mv witness-generators/pol-artifact/libwitness_pol.lib "${BUNDLE_NAME}/pol/" mv witness-generators/pol-artifact/pol.dat "${BUNDLE_NAME}/pol/witness_generator.dat" cp -r witness-generators/pol-artifact/include "${BUNDLE_NAME}/pol/" - mv witness-generators/poq-artifact/libwitness_poq.a "${BUNDLE_NAME}/poq/" + mv witness-generators/poq-artifact/libwitness_poq.lib "${BUNDLE_NAME}/poq/" mv witness-generators/poq-artifact/poq.dat "${BUNDLE_NAME}/poq/witness_generator.dat" cp -r witness-generators/poq-artifact/include "${BUNDLE_NAME}/poq/" - mv witness-generators/zksign-artifact/libwitness_signature.a "${BUNDLE_NAME}/zksign/" + mv witness-generators/zksign-artifact/libwitness_signature.lib "${BUNDLE_NAME}/zksign/" mv witness-generators/zksign-artifact/signature.dat "${BUNDLE_NAME}/zksign/witness_generator.dat" cp -r witness-generators/zksign-artifact/include "${BUNDLE_NAME}/zksign/" - mv witness-generators/poc-artifact/libwitness_poc.a "${BUNDLE_NAME}/poc/" + mv witness-generators/poc-artifact/libwitness_poc.lib "${BUNDLE_NAME}/poc/" mv witness-generators/poc-artifact/poc.dat "${BUNDLE_NAME}/poc/witness_generator.dat" cp -r witness-generators/poc-artifact/include "${BUNDLE_NAME}/poc/"