ci: improve wolfSSL test coverage

[project/uclient.git] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b4e74d77bd1ab90e2ab780006b76bf407a41c12c..cae7102771e0f1bc2790a685e5b8f87766024c02 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ variables:
 
 include:
   - remote: https://gitlab.com/ynezz/openwrt-ci/raw/master/openwrt-ci/gitlab/main.yml
-
+  - local: .gitlab/wolfssl.yml
 
 .native ustream-ssl backend:
   extends: .openwrt-native-build
@@ -13,13 +13,22 @@ include:
     - git clone https://git.openwrt.org/project/ustream-ssl.git
     - |
       cd ustream-ssl &&
-      git checkout -b testing origin/$CI_COMMIT_BRANCH &&
+      git log -1 &&
       export VERBOSE=1 &&
       mkdir -p build && cd build &&
       cmake .. -DCMAKE_INSTALL_PREFIX=/usr $CI_CMAKE_EXTRA_BUILD_ARGS && cd .. &&
       make -j$(($(nproc)+1)) -C build &&
       sudo make install -C build && cd ..
 
+    - cd $CI_PROJECT_DIR
+    - rm -fr ustream-ssl
+
+various native checks with ustream-ssl/wolfSSL backend (master branch):
+  extends: .ustream-ssl wolfSSL master
+
+various native checks with ustream-ssl/wolfSSL backend (release branch):
+  extends: .ustream-ssl wolfSSL release
+
 various native checks with ustream-ssl/OpenSSL backend:
   extends: .native ustream-ssl backend
 
@@ -28,11 +37,6 @@ various native checks with ustream-ssl/mbedTLS backend:
   variables:
     CI_CMAKE_EXTRA_BUILD_ARGS: -DMBEDTLS=on
 
-various native checks with ustream-ssl/wolfSSL backend:
-  extends: .native ustream-ssl backend
-  variables:
-    CI_CMAKE_EXTRA_BUILD_ARGS: -DWOLFSSL=on
-
 build with Atheros ATH79 SDK (out of tree):
   extends: .openwrt-sdk-oot-build_ath79-generic