Skip to content

Commit

Permalink
Merge branch 'main' into smp-dev-add-smp-unit-test
Browse files Browse the repository at this point in the history
  • Loading branch information
chinglee-iot authored Aug 31, 2023
2 parents fa82c09 + 537007d commit 317b4dc
Show file tree
Hide file tree
Showing 345 changed files with 125 additions and 753,739 deletions.
2 changes: 1 addition & 1 deletion .github/scripts/common/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ chardet==4.0.0
colorama
Deprecated==1.2.10
gitdb==4.0.5
GitPython==3.1.30
GitPython==3.1.32
idna==2.10
PyGithub==1.55
PyJWT==2.4.0
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/freertos_plus_demos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -733,10 +733,6 @@ jobs:
working-directory: FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_UDP_Mode_CLI_Windows_Simulator
run: msbuild FreeRTOS_Plus_UDP_with_CLI.sln -t:rebuild -property:Configuration=Debug -m

- name: Build FreeRTOS+WolfSSL FIPS Demo
working-directory: FreeRTOS-Plus/Demo/FreeRTOS_Plus_WolfSSL_FIPS_Ready_Windows_Simulator
run: msbuild FreeRTOS_Plus_WolfSSL.sln -t:rebuild -property:Configuration=Debug -m

- name: Build FreeRTOS+TCP IPv6 Demo
working-directory: FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_IPv6_Demo/IPv6_Multi_WinSim_demo
run: msbuild FreeRTOS_Plus_TCP_IPv6_Multi.sln -t:rebuild -property:Configuration=Debug -m
Expand Down
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@
url = https://github.com/wolfSSL/wolfssl.git
[submodule "FreeRTOS-Plus/ThirdParty/libslirp"]
path = FreeRTOS-Plus/ThirdParty/libslirp
url = https://gitlab.freedesktop.org/slirp/libslirp.git
url = https://gitlab.com/qemu-project/libslirp.git
[submodule "FreeRTOS-Plus/ThirdParty/glib"]
path = FreeRTOS-Plus/ThirdParty/glib
url = https://gitlab.gnome.org/GNOME/glib.git
url = https://github.com/GNOME/glib.git
[submodule "FreeRTOS-Plus/Source/Application-Protocols/coreMQTT-Agent"]
path = FreeRTOS-Plus/Source/Application-Protocols/coreMQTT-Agent
url = https://github.com/FreeRTOS/coreMQTT-Agent.git
Expand Down

This file was deleted.

Loading

0 comments on commit 317b4dc

Please sign in to comment.