pkarashchenko commented on a change in pull request #5732:
URL: https://github.com/apache/incubator-nuttx/pull/5732#discussion_r826303635
##########
File path: tools/ci/cibuild.sh
##########
@@ -381,6 +381,24 @@ function rust {
fi
}
+function zig {
+ mkdir -p "${prebuilt}"/zig
+ add_path "${prebuilt}"/zig
+
+ if ! type zig &> /dev/null; then
+ case ${os} in
+ Darwin)
+ brew install zig
+ ;;
+ Linux)
+ # Currently Debian don't install zig (only built)
+ export ZIG_HOME=${prebuilt}/zig
+ curl -sL
https://ziglang.org/download/0.9.1/zig-linux-x86_64-0.9.1.tar.xz | tar -xJC
"${prebuilt}"/zig --strip-components=1
Review comment:
```suggestion
# Currently Debian don't install zig (only built)
export ZIG_HOME=${prebuilt}/zig
curl -sL
https://ziglang.org/download/0.9.1/zig-linux-x86_64-0.9.1.tar.xz | tar -xJC
"${prebuilt}"/zig --strip-components=1
```
##########
File path: tools/ci/docker/linux/Dockerfile
##########
@@ -68,6 +69,31 @@ RUN mkdir -p $CARGO_HOME \
&& $CARGO_HOME/bin/rustup target add thumbv6m-none-eabi \
&& $CARGO_HOME/bin/rustup target add thumbv7m-none-eabi
+
+# Install Zig from NuttX
+ENV ZIG_HOME=/tools/zig
+
+# Stable
+#RUN apt-get install -y -qq \
+# python3 \
+# python3-pip \
+# && pip3 install ziglang \
+# && python3 -m ziglang version
+
+# Nightly
+RUN \
+ mkdir -p $ZIG_HOME/lib/zig && mkdir $ZIG_HOME/bin && \
+ curl -O -s $(curl -s https://ziglang.org/download/index.json \
+ | jq ".master.\"$(uname -m)-$(uname | awk '{ print tolower($0) }')\"" \
+ | jq -r .tarball); \
+ file=$(ls | grep '.tar.xz') && \
+ tar -xf $file &&\
+ folder=${file%.*.*} &&\
+ mv $folder/lib/* $ZIG_HOME/lib/zig/ &&\
+ mv $folder/zig $ZIG_HOME/bin/ &&\
+ rm -rf $folder && \
+ echo "Zig version: $($ZIG_HOME/bin/zig version)\n Zig/Clang version:
$($ZIG_HOME/bin/zig cc --version)"
Review comment:
```suggestion
RUN mkdir -p $ZIG_HOME/lib/zig && mkdir $ZIG_HOME/bin \
&& curl -O -s $(curl -s https://ziglang.org/download/index.json \
| jq ".master.\"$(uname -m)-$(uname | awk '{ print tolower($0) }')\"" \
| jq -r .tarball) \
&& file=$(ls | grep '.tar.xz') \
&& tar -xf $file \
&& folder=${file%.*.*} \
&& mv $folder/lib/* $ZIG_HOME/lib/zig/ \
&& mv $folder/zig $ZIG_HOME/bin/ \
&& rm -rf $folder
```
##########
File path: tools/ci/docker/linux/Dockerfile
##########
@@ -68,6 +69,31 @@ RUN mkdir -p $CARGO_HOME \
&& $CARGO_HOME/bin/rustup target add thumbv6m-none-eabi \
&& $CARGO_HOME/bin/rustup target add thumbv7m-none-eabi
+
+# Install Zig from NuttX
+ENV ZIG_HOME=/tools/zig
+
+# Stable
+#RUN apt-get install -y -qq \
+# python3 \
+# python3-pip \
+# && pip3 install ziglang \
+# && python3 -m ziglang version
+
+# Nightly
+RUN \
+ mkdir -p $ZIG_HOME/lib/zig && mkdir $ZIG_HOME/bin && \
+ curl -O -s $(curl -s https://ziglang.org/download/index.json \
+ | jq ".master.\"$(uname -m)-$(uname | awk '{ print tolower($0) }')\"" \
+ | jq -r .tarball); \
+ file=$(ls | grep '.tar.xz') && \
+ tar -xf $file &&\
+ folder=${file%.*.*} &&\
+ mv $folder/lib/* $ZIG_HOME/lib/zig/ &&\
+ mv $folder/zig $ZIG_HOME/bin/ &&\
+ rm -rf $folder && \
+ echo "Zig version: $($ZIG_HOME/bin/zig version)\n Zig/Clang version:
$($ZIG_HOME/bin/zig cc --version)"
Review comment:
BTW why we can't use `curl -sL
https://ziglang.org/download/0.9.1/zig-linux-x86_64-0.9.1.tar.xz | tar -xJC
$(ZIG_HOME) --strip-components=1` ?
##########
File path: tools/ci/docker/linux/Dockerfile
##########
@@ -68,6 +69,31 @@ RUN mkdir -p $CARGO_HOME \
&& $CARGO_HOME/bin/rustup target add thumbv6m-none-eabi \
&& $CARGO_HOME/bin/rustup target add thumbv7m-none-eabi
+
+# Install Zig from NuttX
+ENV ZIG_HOME=/tools/zig
+
+# Stable
+#RUN apt-get install -y -qq \
+# python3 \
+# python3-pip \
+# && pip3 install ziglang \
+# && python3 -m ziglang version
Review comment:
```suggestion
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
