revert, resolve merge conflicts

Author: gojimmypi

.github/workflows/zephyr.yml

@@ -14,9 +14,7 @@ jobs:
         config:
           - zephyr-ref: v3.4.0
             zephyr-sdk: 0.16.1
-
-    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     # This should be a safe limit for the tests to run.
     timeout-minutes: 20
     steps:
@@ -89,7 +87,7 @@ jobs:
 
       - name: Upload failure logs
         if: ${{ failure() && steps.wolfssh-test.outcome == 'failure' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: zephyr-client-test-logs
           path: logs.zip

ide/include.am

@@ -1,12 +1,12 @@
-# vim:ft=automake
-# included from Top Level Makefile.am
-# All paths should be given relative to the root
-
-include ide/CSBENCH/include.am
-include ide/Espressif/include.am
-include ide/IAR-EWARM/include.am
-include ide/MQX/include.am
-include ide/STM32CUBE/include.am
-include ide/winvs/include.am
-
-EXTRA_DIST += ide/Renesas
+# vim:ft=automake
+# included from Top Level Makefile.am
+# All paths should be given relative to the root
+
+include ide/winvs/include.am
+include ide/mplabx/include.am
+include ide/CSBENCH/include.am
+include ide/MQX/include.am
+include ide/IAR-EWARM/include.am
+include ide/STM32CUBE/include.am
+
+EXTRA_DIST += ide/Renesas