diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index a8d220b1..007cbb68 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -425,13 +425,14 @@ jobs: fail-fast: false matrix: example: - - path: esp32/device-dashboard + - path: esp32 name: ${{ matrix.example.path }} steps: - uses: actions/checkout@v4 with: { fetch-depth: 2 } - run: echo # nothing specific to install or do - - run: make -C examples/${{ matrix.example.path }} build + - run: make -C tutorials/http/device-dashboard/${{ matrix.example.path }} build + device_dashboard_examples_arm: runs-on: ubuntu-latest diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml index 4c7bc942..59fdc728 100644 --- a/.github/workflows/quicktest.yml +++ b/.github/workflows/quicktest.yml @@ -286,7 +286,7 @@ jobs: fail-fast: false matrix: example: - - path: esp32/device-dashboard + - path: esp32 name: ${{ matrix.example.path }} env: GO: 0 @@ -294,12 +294,12 @@ jobs: - uses: actions/checkout@v4 with: { fetch-depth: 2 } - run: | - if ./test/match_changed_files.sh '^src|examples/device-dashboard|^examples/${{ matrix.example.path }}'; then + if ./test/match_changed_files.sh '^src|tutorials/http/device-dashboard'; then echo GO=1 >> $GITHUB_ENV # nothing specific to install or do fi - if: ${{ env.GO == 1 }} - run: make -C examples/${{ matrix.example.path }} build + run: make -C tutorials/http/device-dashboard/${{ matrix.example.path }} build device_dashboard_examples_arm: runs-on: ubuntu-latest diff --git a/examples/esp32/device-dashboard/main/mongoose.c b/examples/esp32/device-dashboard/main/mongoose.c deleted file mode 120000 index 7a2752cb..00000000 --- a/examples/esp32/device-dashboard/main/mongoose.c +++ /dev/null @@ -1 +0,0 @@ -../../../../mongoose.c \ No newline at end of file diff --git a/examples/esp32/device-dashboard/main/mongoose.h b/examples/esp32/device-dashboard/main/mongoose.h deleted file mode 120000 index daff1633..00000000 --- a/examples/esp32/device-dashboard/main/mongoose.h +++ /dev/null @@ -1 +0,0 @@ -../../../../mongoose.h \ No newline at end of file diff --git a/examples/esp32/device-dashboard/main/net.c b/examples/esp32/device-dashboard/main/net.c deleted file mode 120000 index d0758f09..00000000 --- a/examples/esp32/device-dashboard/main/net.c +++ /dev/null @@ -1 +0,0 @@ -../../../device-dashboard/net.c \ No newline at end of file diff --git a/examples/esp32/device-dashboard/main/net.h b/examples/esp32/device-dashboard/main/net.h deleted file mode 120000 index 413c4173..00000000 --- a/examples/esp32/device-dashboard/main/net.h +++ /dev/null @@ -1 +0,0 @@ -../../../device-dashboard/net.h \ No newline at end of file diff --git a/examples/esp32/device-dashboard/main/packed_fs.c b/examples/esp32/device-dashboard/main/packed_fs.c deleted file mode 120000 index ebd127df..00000000 --- a/examples/esp32/device-dashboard/main/packed_fs.c +++ /dev/null @@ -1 +0,0 @@ -../../../device-dashboard/packed_fs.c \ No newline at end of file diff --git a/examples/esp32/device-dashboard/CMakeLists.txt b/tutorials/http/device-dashboard/esp32/CMakeLists.txt similarity index 100% rename from examples/esp32/device-dashboard/CMakeLists.txt rename to tutorials/http/device-dashboard/esp32/CMakeLists.txt diff --git a/examples/esp32/device-dashboard/Makefile b/tutorials/http/device-dashboard/esp32/Makefile similarity index 95% rename from examples/esp32/device-dashboard/Makefile rename to tutorials/http/device-dashboard/esp32/Makefile index 7c0842f9..657c2e32 100644 --- a/examples/esp32/device-dashboard/Makefile +++ b/tutorials/http/device-dashboard/esp32/Makefile @@ -1,5 +1,5 @@ THISDIR = $(realpath $(CURDIR)) -ROOTDIR = $(realpath $(CURDIR)/../../..) +ROOTDIR = $(realpath $(CURDIR)/../../../..) DOCKER ?= docker run --rm $(DA) -v $(ROOTDIR):$(ROOTDIR) -w $(THISDIR) espressif/idf CMD ?= idf.py build PORT ?= /dev/ttyUSB0 diff --git a/examples/esp32/device-dashboard/README.md b/tutorials/http/device-dashboard/esp32/README.md similarity index 100% rename from examples/esp32/device-dashboard/README.md rename to tutorials/http/device-dashboard/esp32/README.md diff --git a/examples/esp32/device-dashboard/main/CMakeLists.txt b/tutorials/http/device-dashboard/esp32/main/CMakeLists.txt similarity index 100% rename from examples/esp32/device-dashboard/main/CMakeLists.txt rename to tutorials/http/device-dashboard/esp32/main/CMakeLists.txt diff --git a/examples/esp32/device-dashboard/main/main.c b/tutorials/http/device-dashboard/esp32/main/main.c similarity index 100% rename from examples/esp32/device-dashboard/main/main.c rename to tutorials/http/device-dashboard/esp32/main/main.c diff --git a/tutorials/http/device-dashboard/esp32/main/mongoose.c b/tutorials/http/device-dashboard/esp32/main/mongoose.c new file mode 120000 index 00000000..fe5764e5 --- /dev/null +++ b/tutorials/http/device-dashboard/esp32/main/mongoose.c @@ -0,0 +1 @@ +../../../../../mongoose.c \ No newline at end of file diff --git a/tutorials/http/device-dashboard/esp32/main/mongoose.h b/tutorials/http/device-dashboard/esp32/main/mongoose.h new file mode 120000 index 00000000..4cd6a2b4 --- /dev/null +++ b/tutorials/http/device-dashboard/esp32/main/mongoose.h @@ -0,0 +1 @@ +../../../../../mongoose.h \ No newline at end of file diff --git a/examples/esp32/device-dashboard/main/mongoose_config.h b/tutorials/http/device-dashboard/esp32/main/mongoose_config.h similarity index 100% rename from examples/esp32/device-dashboard/main/mongoose_config.h rename to tutorials/http/device-dashboard/esp32/main/mongoose_config.h diff --git a/tutorials/http/device-dashboard/esp32/main/net.c b/tutorials/http/device-dashboard/esp32/main/net.c new file mode 120000 index 00000000..2541c1ab --- /dev/null +++ b/tutorials/http/device-dashboard/esp32/main/net.c @@ -0,0 +1 @@ +../../net.c \ No newline at end of file diff --git a/tutorials/http/device-dashboard/esp32/main/net.h b/tutorials/http/device-dashboard/esp32/main/net.h new file mode 120000 index 00000000..b428c377 --- /dev/null +++ b/tutorials/http/device-dashboard/esp32/main/net.h @@ -0,0 +1 @@ +../../net.h \ No newline at end of file diff --git a/tutorials/http/device-dashboard/esp32/main/packed_fs.c b/tutorials/http/device-dashboard/esp32/main/packed_fs.c new file mode 120000 index 00000000..3d58f82d --- /dev/null +++ b/tutorials/http/device-dashboard/esp32/main/packed_fs.c @@ -0,0 +1 @@ +../../packed_fs.c \ No newline at end of file diff --git a/examples/esp32/device-dashboard/main/wifi.c b/tutorials/http/device-dashboard/esp32/main/wifi.c similarity index 100% rename from examples/esp32/device-dashboard/main/wifi.c rename to tutorials/http/device-dashboard/esp32/main/wifi.c diff --git a/examples/esp32/device-dashboard/partitions.csv b/tutorials/http/device-dashboard/esp32/partitions.csv similarity index 100% rename from examples/esp32/device-dashboard/partitions.csv rename to tutorials/http/device-dashboard/esp32/partitions.csv diff --git a/examples/esp32/device-dashboard/sdkconfig.defaults b/tutorials/http/device-dashboard/esp32/sdkconfig.defaults similarity index 100% rename from examples/esp32/device-dashboard/sdkconfig.defaults rename to tutorials/http/device-dashboard/esp32/sdkconfig.defaults