update to new zig-v0.14.0-dev and minor fixes

kassane · Aug 6, 2024 · 279f5db · 279f5db
1 parent e03d2e4
commit 279f5db
Show file tree

Hide file tree

Showing 5 changed files with 137 additions and 102 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -2,31 +2,27 @@ FROM espressif/idf
 
 ARG DEBIAN_FRONTEND=nointeractive
 ARG CONTAINER_USER=esp
-ARG USER_UID=1000
+ARG USER_UID=1050
 ARG USER_GID=$USER_UID
 
 RUN apt-get update \
   && apt install -y -q \
   cmake \
   git \
-  hwdata \
   libglib2.0-0 \
   libnuma1 \
   libpixman-1-0 \
-  linux-tools-virtual \
   && rm -rf /var/lib/apt/lists/*
 
-RUN update-alternatives --install /usr/local/bin/usbip usbip `ls /usr/lib/linux-tools/*/usbip | tail -n1` 20
-
 # QEMU
-ENV QEMU_REL=xtensa-softmmu-esp_develop_8.2.0_20240122-x86_64-linux-gnu
+ENV QEMU_REL=esp_develop_8.2.0_20240122
 ENV QEMU_SHA256=e7c72ef5705ad1444d391711088c8717fc89f42e9bf6d1487f9c2a326b8cfa83
-ENV QEMU_DIST=qemu-${QEMU_REL}.tar.xz
+ENV QEMU_DIST=qemu-xtensa-softmmu-${QEMU_REL}-x86_64-linux-gnu.tar.xz
 ENV QEMU_URL=https://github.com/espressif/qemu/releases/download/esp-develop-8.2.0-20240122/${QEMU_DIST}
 
 # Zig v0.14.0 - xtensa
 ENV ZIG_REL=zig-relsafe-espressif-x86_64-linux-musl-baseline
-ENV ZIG_SHA256=0b70670e28f9568bb8112c59572e6790d897ba17ed50ac15b3c3b42330a3c2d7
+ENV ZIG_SHA256=a7a23429a8cbc4cd872a25aafac6dbab24b9d20f3fd0b5624fac6fe20f16425e
 ENV ZIG_DIST=${ZIG_REL}.tar.xz
 ENV ZIG_URL=https://github.com/kassane/zig-espressif-bootstrap/releases/download/0.14.0-xtensa-dev/${ZIG_DIST}
 
@@ -59,4 +55,4 @@ RUN echo "source /opt/esp/idf/export.sh > /dev/null 2>&1" >> ~/.bashrc
 
 ENTRYPOINT [ "/opt/esp/entrypoint.sh" ]
 
-CMD ["/bin/bash", "-c"]
+CMD ["/bin/bash", "-c"]
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,44 +1,35 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.183.0/containers/ubuntu
 {
 	"name": "ESP-IDF QEMU",
 	"build": {
 		"dockerfile": "Dockerfile"
 	},
-	// Add the IDs of extensions you want installed when the container is created
-	"workspaceMount": "source=${localWorkspaceFolder},target=${localWorkspaceFolder},type=bind",
-	/* the path of workspace folder to be opened after container is running
-	 */
-	"workspaceFolder": "${localWorkspaceFolder}",
-	"mounts": [
-		"source=extensionCache,target=/root/.vscode-server/extensions,type=volume"
-	],
 	"customizations": {
 		"vscode": {
 			"settings": {
 				"terminal.integrated.defaultProfile.linux": "bash",
 				"idf.espIdfPath": "/opt/esp/idf",
 				"idf.customExtraPaths": "",
-				"idf.pythonBinPath": "/opt/esp/python_env/idf5.3_py3.10_env/bin/python",
+				"idf.pythonBinPath": "/opt/esp/python_env/idf5.4_py3.12_env/bin/python",
 				"idf.toolsPath": "/opt/esp",
 				"idf.gitPath": "/usr/bin/git"
 			},
 			"extensions": [
 				"espressif.esp-idf-extension"
-			],
+			]
 		},
 		"codespaces": {
 			"settings": {
 				"terminal.integrated.defaultProfile.linux": "bash",
 				"idf.espIdfPath": "/opt/esp/idf",
 				"idf.customExtraPaths": "",
-				"idf.pythonBinPath": "/opt/esp/python_env/idf5.3_py3.10_env/bin/python",
+				"idf.pythonBinPath": "/opt/esp/python_env/idf5.4_py3.12_env/bin/python",
 				"idf.toolsPath": "/opt/esp",
 				"idf.gitPath": "/usr/bin/git"
 			},
 			"extensions": [
-				"espressif.esp-idf-extension"
-			],
+				"espressif.esp-idf-extension",
+				"espressif.esp-idf-web"
+			]
 		}
 	},
 	"runArgs": ["--privileged"]

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,6 +1,6 @@
 name: Wokwi-CI Build
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: espressif/esp-idf-ci-action@v1
         with:
-          esp_idf_version: v5.2.1
+          esp_idf_version: v5.3
           target: ${{ matrix.target }}
       - name: Copy diagram ${{ matrix.target }}
         run: |

diff --git a/README.md b/README.md
@@ -11,8 +11,8 @@ This project aims to integrate Zig language and toolchain with the [Espressif Io
 
 ## Prerequisites
 
-- [Zig](https://ziglang.org/download) toolchain - v0.12.0 or master
-- [ESP-IDF](https://github.com/espressif/esp-idf) - v4.4 or v5.2 or master
+- [Zig](https://ziglang.org/download) toolchain - v0.13.0 or master
+- [ESP-IDF](https://github.com/espressif/esp-idf) - v4.4.x or v5.x or master
 
 ### Targets Allowed