Merge pull request #704 from SparkiDev/wolfssl_macos_arm

Fix CI so that wolfSSL builds with appropriate ASM for macOS chip
cisco · Apr 29, 2024 · c6583bc · c6583bc
2 parents 5ea41da + c2dbe47
commit c6583bc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/.github/workflows/autotools.yml b/.github/workflows/autotools.yml
@@ -37,6 +37,7 @@ jobs:
       run: |
         git clone https://github.com/wolfSSL/wolfssl
         cd wolfssl
+        git checkout v5.7.0-stable
         ./autogen.sh
         ./configure '--enable-srtp-kdf' '--enable-aesctr' '--enable-intelasm' '--enable-aesgcm-stream'
         make
@@ -58,8 +59,14 @@ jobs:
         brew install autoconf automake libtool
         git clone https://github.com/wolfSSL/wolfssl
         cd wolfssl
+        git checkout v5.7.0-stable
         ./autogen.sh
-        ./configure '--enable-srtp-kdf' '--enable-aesctr' '--enable-intelasm' '--enable-aesgcm-stream'
+        CPU=`sysctl -n machdep.cpu.brand_string`
+        if [[ "$CPU" =~ Intel ]]; then
+          ./configure '--enable-srtp-kdf' '--enable-aesctr' '--enable-intelasm' '--enable-aesgcm-stream'
+        else
+          ./configure '--enable-srtp-kdf' '--enable-aesctr' '--enable-armasm' '--enable-aesgcm-stream'
+        fi
         make
         sudo make install
         cd ..

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -53,6 +53,7 @@ jobs:
       run: |
         git clone https://github.com/wolfSSL/wolfssl
         cd wolfssl
+        git checkout v5.7.0-stable
         ./autogen.sh
         ./configure '--enable-srtp-kdf' '--enable-aesctr' '--enable-intelasm' '--enable-aesgcm-stream'
         make
@@ -85,8 +86,14 @@ jobs:
         brew install autoconf automake libtool
         git clone https://github.com/wolfSSL/wolfssl
         cd wolfssl
+        git checkout v5.7.0-stable
         ./autogen.sh
-        ./configure '--enable-srtp-kdf' '--enable-aesctr' '--enable-intelasm' '--enable-aesgcm-stream'
+        CPU=`sysctl -n machdep.cpu.brand_string`
+        if [[ "$CPU" =~ Intel ]]; then
+          ./configure '--enable-srtp-kdf' '--enable-aesctr' '--enable-intelasm' '--enable-aesgcm-stream'
+        else
+          ./configure '--enable-srtp-kdf' '--enable-aesctr' '--enable-armasm' '--enable-aesgcm-stream'
+        fi
         make
         sudo make install
         cd ..