From 50835c14a20c5c2cb2627a379c66c78142d7d037 Mon Sep 17 00:00:00 2001 From: JacobBarthelmeh Date: Thu, 29 May 2025 15:25:03 -0600 Subject: [PATCH 1/3] fix warning of const char* passed as char* --- wolfcrypt/src/wc_port.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wolfcrypt/src/wc_port.c b/wolfcrypt/src/wc_port.c index fc42f6fdb..4813f2dc0 100644 --- a/wolfcrypt/src/wc_port.c +++ b/wolfcrypt/src/wc_port.c @@ -2472,7 +2472,7 @@ int wolfSSL_HwPkMutexUnLock(void) int wc_InitMutex(wolfSSL_Mutex* m) { - if (tx_mutex_create(m, "wolfSSL Mutex", TX_NO_INHERIT) == 0) + if (tx_mutex_create(m, (CHAR*)"wolfSSL Mutex", TX_NO_INHERIT) == 0) return 0; else return BAD_MUTEX_E; From 677eeb31e414541773a9bfb89ee3614d24e2bf18 Mon Sep 17 00:00:00 2001 From: JacobBarthelmeh Date: Thu, 29 May 2025 15:29:02 -0600 Subject: [PATCH 2/3] add netxduo compile test --- .github/workflows/threadx.yml | 62 +++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 .github/workflows/threadx.yml diff --git a/.github/workflows/threadx.yml b/.github/workflows/threadx.yml new file mode 100644 index 000000000..0f243b670 --- /dev/null +++ b/.github/workflows/threadx.yml @@ -0,0 +1,62 @@ +name: ThreadXBuild Test + +on: + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] + +jobs: + build: + + runs-on: ubuntu-22.04 + timeout-minutes: 10: + + steps: + - name: Cache NetXDuo bundle + id: cache-netxduo + uses: actions/cache@v3 + with: + path: ./v6.4.3_rel.tar.gz + key: netxduo-bundle-v6.4.3_rel + + - name: Download NetXDuo bundle if not cached + if: steps.cache-netxduo.outputs.cache-hit != 'true' + run: | + wget https://github.com/eclipse-threadx/netxduo/archive/refs/tags/v6.4.3_rel.tar.gz + + - name: Extract NetXDuo bundle + run: | + mkdir -p netxduo_src + tar -xzf v6.4.3_rel.tar.gz -C netxduo_src --strip-components=1 + + - name: Install NetXDuo Dependencies + working-directory: ./netxduo_src + run: | + ./scripts/install.sh + + - name: Build NetXDuo + working-directory: ./netxduo_src + run: | + rm -rf test/cmake/threadx + rm -rf test/cmake/filex + ./scripts/build_nxd64.sh + + - uses: actions/checkout@v4 + with: + repository: wolfssl/wolfssl + path: wolfssl + + - name: wolfssl autogen + working-directory: ./wolfssl + run: ./autogen.sh + + - name: wolfssl configure + working-directory: ./wolfssl + run: ./configure --enable-static --disable-shared --enable-enckeys --disable-examples --disable-benchmark --disable-crypttests CPPFLAGS="-DTHREADX -DHAVE_NETX -I${{ github.workspace }}/netxduo_src/common/inc -I${{ github.workspace }}/netxduo_src/ports/linux/gnu/inc -I${{ github.workspace }}/netxduo_src/test/cmake/netxduo64/build/libs/inc" LDFLAGS="-L${{ github.workspace }}/netxduo_src/test/cmake/netxduo64/build/default_build_coverage/netxduo -lnetxduo -L${{ github.workspace }}/netxduo_src/test/cmake/netxduo64/build/libs/threadx -lthreadx" + + - name: wolfssl make + working-directory: ./wolfssl + run: | + sed -i 's/ -Werror//' Makefile + make From 54a52f04821d8e3e85b76d4e7344cc0024bcab38 Mon Sep 17 00:00:00 2001 From: JacobBarthelmeh Date: Sun, 1 Jun 2025 17:00:20 -0600 Subject: [PATCH 3/3] remove sed command for -Werror and refactor threadx.yml workflow --- .github/workflows/threadx.yml | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/.github/workflows/threadx.yml b/.github/workflows/threadx.yml index 0f243b670..f93cea9c1 100644 --- a/.github/workflows/threadx.yml +++ b/.github/workflows/threadx.yml @@ -10,7 +10,7 @@ jobs: build: runs-on: ubuntu-22.04 - timeout-minutes: 10: + timeout-minutes: 10 steps: - name: Cache NetXDuo bundle @@ -35,28 +35,23 @@ jobs: run: | ./scripts/install.sh - - name: Build NetXDuo + - name: Configure NetX with DNS Client Support + working-directory: ./netxduo_src + run: | + cp addons/dns/nxd_dns.h ./common/inc/ + cp addons/dns/nxd_dns.c ./common/src/ + + - name: Build NetXDuo with DNS Support working-directory: ./netxduo_src run: | rm -rf test/cmake/threadx rm -rf test/cmake/filex ./scripts/build_nxd64.sh - - uses: actions/checkout@v4 + - name: Build wolfSSL + uses: wolfSSL/actions-build-autotools-project@v1 with: - repository: wolfssl/wolfssl path: wolfssl + configure: --enable-enckeys --disable-examples --disable-benchmark --disable-crypttests CPPFLAGS="-DTHREADX -DHAVE_NETX -DWOLFSSL_USER_IO -I${{ github.workspace }}/netxduo_src/common/inc -I${{ github.workspace }}/netxduo_src/ports/linux/gnu/inc -I${{ github.workspace }}/netxduo_src/test/cmake/netxduo64/build/libs/inc" LDFLAGS="-L${{ github.workspace }}/netxduo_src/test/cmake/netxduo64/build/default_build_coverage/netxduo -L${{ github.workspace }}/netxduo_src/test/cmake/netxduo64/build/libs/threadx" LIBS="-lnetxduo -lthreadx" + install: false - - name: wolfssl autogen - working-directory: ./wolfssl - run: ./autogen.sh - - - name: wolfssl configure - working-directory: ./wolfssl - run: ./configure --enable-static --disable-shared --enable-enckeys --disable-examples --disable-benchmark --disable-crypttests CPPFLAGS="-DTHREADX -DHAVE_NETX -I${{ github.workspace }}/netxduo_src/common/inc -I${{ github.workspace }}/netxduo_src/ports/linux/gnu/inc -I${{ github.workspace }}/netxduo_src/test/cmake/netxduo64/build/libs/inc" LDFLAGS="-L${{ github.workspace }}/netxduo_src/test/cmake/netxduo64/build/default_build_coverage/netxduo -lnetxduo -L${{ github.workspace }}/netxduo_src/test/cmake/netxduo64/build/libs/threadx -lthreadx" - - - name: wolfssl make - working-directory: ./wolfssl - run: | - sed -i 's/ -Werror//' Makefile - make