Merge pull request #2667 from cesanta/rewact

code .remove MbedTLS from essentials. Add tests in full
cesanta · Mar 25, 2024 · f3ad057 · f3ad057
2 parents d042697 + 406d6cc
commit f3ad057
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 15 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -14,7 +14,7 @@ jobs:
       matrix:
         cc: [gcc, clang, g++, clang++]
         target: [test, mip_test]
-        ssl: ["", MBEDTLS, OPENSSL]
+        ssl: ["", BUILTIN, MBEDTLS, OPENSSL]
         select: ["-DMG_ENABLE_POLL=0 -DMG_ENABLE_EPOLL=0", "-DMG_ENABLE_POLL=1 -DMG_ENABLE_EPOLL=0", "-DMG_ENABLE_POLL=0 -DMG_ENABLE_EPOLL=1"]
         exclude:
         - ssl: MBEDTLS
@@ -36,16 +36,26 @@ jobs:
     - run: ./test/setup_ga_network.sh && sudo apt -y update ; sudo apt -y install libmbedtls-dev && make ${{ matrix.target }}
   s390:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ssl: ["", BUILTIN]
+    name: S390 SSL=${{ matrix.ssl }}
     steps:
     - uses: actions/checkout@v3
       with: { fetch-depth: 2 }
-    - run: sudo apt -y update ; sudo apt -y install qemu binfmt-support qemu-user-static && docker run --rm --privileged multiarch/qemu-user-static --reset -p yes && make s390
+    - run: sudo apt -y update ; sudo apt -y install qemu binfmt-support qemu-user-static && docker run --rm --privileged multiarch/qemu-user-static --reset -p yes && make s390 SSL=${{ matrix.ssl }}
   armhf:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ssl: ["", BUILTIN]
+    name: ArmHF SSL=${{ matrix.ssl }}
     steps:
     - uses: actions/checkout@v3
       with: { fetch-depth: 2 }
-    - run: sudo apt -y update ; sudo apt -y install qemu binfmt-support qemu-user-static && docker run --rm --privileged multiarch/qemu-user-static --reset -p yes && make armhf
+    - run: sudo apt -y update ; sudo apt -y install qemu binfmt-support qemu-user-static && docker run --rm --privileged multiarch/qemu-user-static --reset -p yes && make armhf SSL=${{ matrix.ssl }}
   linux2:
     runs-on: ubuntu-latest
     steps:
@@ -58,7 +68,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ssl: ["", MBEDTLS, OPENSSL]
+        ssl: ["", BUILTIN, MBEDTLS, OPENSSL]
         select: [-DMG_ENABLE_POLL=0, -DMG_ENABLE_POLL=1]
         exclude:
         - ssl: MBEDTLS
@@ -82,27 +92,39 @@ jobs:
       fail-fast: false
       matrix:
         target: [vc98, vc17, vc22, mingw, mingw++]
+        ssl: ["", BUILTIN]
         select: [-DMG_ENABLE_POLL=0, -DMG_ENABLE_POLL=1]
         exclude:
         - target: vc98
           select: -DMG_ENABLE_POLL=1
-    name: windows ${{ matrix.target }} TFLAGS=${{ matrix.select }}
+    name: windows ${{ matrix.target }} SSL=${{ matrix.ssl }} TFLAGS=${{ matrix.select }}
     env:
+      SSL: SSL=${{ matrix.ssl }}
       TFLAGS: ${{ matrix.select }}
     steps:
     - uses: actions/checkout@v3
       with: { fetch-depth: 2 }
     - run: make ${{ matrix.target }} 
   arm:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ssl: ["", BUILTIN]
+    name: Arm SSL=${{ matrix.ssl }}
     steps:
     - uses: actions/checkout@v3
-    - run: make arm
+    - run: make arm SSL=${{ matrix.ssl }}
   riscv:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ssl: ["", BUILTIN]
+    name: RISC-V SSL=${{ matrix.ssl }}
     steps:
     - uses: actions/checkout@v3
-    - run: make riscv
+    - run: make riscv SSL=${{ matrix.ssl }}
 
   examples:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml
@@ -15,7 +15,7 @@ jobs:
       matrix:
         cc: [gcc, clang++]
         target: [test, mip_test]
-        ssl: ["", MBEDTLS, BUILTIN]
+        ssl: ["", BUILTIN]
     name: linux ${{ matrix.target }} CC=${{ matrix.cc }} SSL=${{ matrix.ssl }}
     env:
       CC: ${{ matrix.cc }}
@@ -25,7 +25,7 @@ jobs:
       with: { fetch-depth: 2 }
     - run: if ./test/match_changed_files.sh '^test|^src/.*.[ch]' ; then echo GO=1 >> $GITHUB_ENV ; fi
     - if: ${{ env.GO == 1 }}
-      run: ./test/setup_ga_network.sh && sudo apt -y update ; sudo apt -y install libmbedtls-dev && make ${{ matrix.target }}
+      run: ./test/setup_ga_network.sh && make ${{ matrix.target }}
   s390:
     runs-on: ubuntu-latest
     steps:
@@ -57,20 +57,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ssl: ["", MBEDTLS, BUILTIN]
+        ssl: ["", BUILTIN]
     name: macos SSL=${{ matrix.ssl }}
     env:
       SSL: ${{ matrix.ssl }}
-      TFLAGS: -DNO_SNTP_CHECK -Wno-sign-conversion # Workaround for MbedTLS 3.5.0
+      TFLAGS: -DNO_SNTP_CHECK
       HOMEBREW_NO_AUTO_UPDATE: 1
     steps:
     - uses: actions/checkout@v3
       with: { fetch-depth: 2 }
     - run: if ./test/match_changed_files.sh '^test|^src/.*.[ch]' ; then echo GO=1 >> $GITHUB_ENV ; fi
     - if: ${{ env.GO == 1 }}
-      run: brew install jq mbedtls openssl
-    - if: ${{ env.GO == 1 }}
-      run:  make test ASAN_OPTIONS= MBEDTLS=`echo /usr/local/Cellar/mbedtls*/*` OPENSSL=`echo /usr/local/Cellar/openssl*/*`
+      run:  make test ASAN_OPTIONS=
     - if: ${{ env.GO == 1 }}
       run: make mg_prefix
   windows:
@@ -101,7 +99,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - run: sudo apt -y install libmbedtls-dev libpcap-dev
+    - run: sudo apt -y install libpcap-dev
     - run: make examples
     - run: make clean
   examples_win: