Use a simpler version of skipping the asm builds

cf #1692 (comment)
mit-plv · Oct 23, 2023 · 77ed9ba · 77ed9ba
1 parent 3378f57
commit 77ed9ba
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 118 deletions.
diff --git a/.github/workflows/c.yml b/.github/workflows/c.yml
@@ -37,6 +37,6 @@ jobs:
     - name: make only-test-bedrock2-files CC=gcc
       run: make only-test-bedrock2-files CC=gcc EXTERNAL_DEPENDENCIES=1
     - name: BoringSSL C test
-      run: EXTRA_CFLAGS="" PATCH_FOLDER="etc/ci/boringssl-patches/" etc/ci/test-fiat-c-boringssl.sh fiat-c/src
+      run: EXTRA_CFLAGS="" etc/ci/test-fiat-c-boringssl.sh fiat-c/src
     - name: BoringSSL bedrock2 test
-      run: EXTRA_CFLAGS="$(make bedrock2-extra-cflags SKIP_INCLUDE=1 2>/dev/null)" PATCH_FOLDER="etc/ci/boringssl-bedrock2-patches/" etc/ci/test-fiat-c-boringssl.sh fiat-bedrock2/src
+      run: EXTRA_CFLAGS="$(make bedrock2-extra-cflags SKIP_INCLUDE=1 2>/dev/null)" etc/ci/test-fiat-c-boringssl.sh fiat-bedrock2/src
diff --git a/etc/ci/boringssl-bedrock2-patches/2023-10-05-p256-adx.patch b/etc/ci/boringssl-bedrock2-patches/2023-10-05-p256-adx.patch
diff --git a/etc/ci/boringssl-patches/2023-10-05-p256-adx.patch b/etc/ci/boringssl-patches/2023-10-05-p256-adx.patch
diff --git a/etc/ci/test-fiat-c-boringssl.sh b/etc/ci/test-fiat-c-boringssl.sh
@@ -24,10 +24,6 @@ if [ -z "$SUBCOMPONENT" ]; then
 fi
 SUBCOMPONENT_PATH="$(cd "$SUBCOMPONENT" && pwd)"
 
-if [ ! -z "${PATCH_FOLDER}" ]; then
-    PATCH_FOLDER="$(realpath "${PATCH_FOLDER}")"
-fi
-
 pushd boringssl >/dev/null
 
 echo "::group::Patching BoringSSL"
@@ -38,13 +34,6 @@ echo "::group::Patching BoringSSL"
         cp "${SUBCOMPONENT_PATH}/${i/.h/.c}" "$i" || exit $?
       done ) || exit $?
     ( cd third_party/fiat && git --no-pager diff )
-    if [ ! -z "${PATCH_FOLDER}" ]; then
-        ( cd third_party/fiat &&
-          for i in "${PATCH_FOLDER}"/*.patch; do
-              git apply "$i"
-          done ) || exit $?
-    fi
-    ( cd third_party/fiat && git --no-pager diff )
 }) || exit $?
 echo "::endgroup::"
 
@@ -53,7 +42,7 @@ echo "::group::Building BoringSSL"
     set -ex
     mkdir build
     cd build
-    cmake -GNinja .. -DCMAKE_CXX_FLAGS="-Wno-error=unused-function ${EXTRA_CFLAGS}" -DCMAKE_C_FLAGS="-Wno-error=unused-function ${EXTRA_CFLAGS}" || exit $?
+    cmake -GNinja .. -DOPENSSL_NO_ASM=1 -DCMAKE_CXX_FLAGS="-Wno-error=unused-function ${EXTRA_CFLAGS}" -DCMAKE_C_FLAGS="-Wno-error=unused-function ${EXTRA_CFLAGS}" || exit $?
     ninja || exit $?
 }) || exit $?
 echo "::endgroup::"