xiaoxiang781216 commented on a change in pull request #5732: URL: https://github.com/apache/incubator-nuttx/pull/5732#discussion_r825468945
########## File path: tools/ci/docker/linux/Dockerfile ########## @@ -89,10 +88,11 @@ RUN curl -s https://ziglang.org/download/index.json \ file=$(ls | grep 'zig*.*.*') && \ tar -xvf $file &&\ folder=$file \ - folder=${folder%.*.*} \ - && mkdir -p $ZIG_HOME &&\ - mv $folder/* $ZIG_HOME &&\ - rm -rf $folder && echo "Zig version: " && $ZIG_HOME/bin/zig version + folder=${folder%.*.*} &&\ Review comment: merge to previous patch ########## File path: tools/ci/cibuild.sh ########## @@ -395,7 +395,7 @@ function zig { export ZIG_HOME=${prebuilt}/zig cd /tmp wget --quiet https://ziglang.org/download/0.9.1/zig-linux-x86_64-0.9.1.tar.xz - tar -xf zig-linux-x86_64-0.9.1.tar.xz && rm zig-linux-x86_64-0.9.1.tar.xz && mv zig-linux-x86_64-.0.9.1/* "${prebuilt}"/zig && rm -fr zig-linux-x86_64-0.9.1 + tar -xf zig-linux-x86_64-0.9.1.tar.xz && rm zig-linux-x86_64-0.9.1.tar.xz && mv zig-linux-x86_64-0.9.1/* "${prebuilt}"/zig && rm -fr zig-linux-x86_64-0.9.1 Review comment: merge to previous patch ########## File path: tools/ci/docker/linux/Dockerfile ########## @@ -68,6 +70,30 @@ 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 \ +# && mkdir $ZIG_HOME \ +# && pip3 install ziglang \ +# && python3 -m ziglang version + +# Nightly +RUN curl -s https://ziglang.org/download/index.json \ + | jq --raw-output '.master."x86_64-linux".tarball' \ + | wget -q --show-progress -i -; \ Review comment: can we replace wget with curl here? ########## File path: tools/ci/docker/linux/Dockerfile ########## @@ -90,7 +90,7 @@ RUN curl -s https://ziglang.org/download/index.json \ folder=$file \ folder=${folder%.*.*} &&\ mkdir -p $ZIG_HOME/{bin,lib/zig} &&\ - mv $folder/lib/* ~/.local/lib/zig &&\ + mv $folder/lib/* $ZIG_HOME/lib/zig &&\ Review comment: ditto ########## File path: tools/ci/docker/linux/Dockerfile ########## @@ -84,15 +84,15 @@ ENV ZIG_HOME=/tools/zig # Nightly RUN curl -s https://ziglang.org/download/index.json \ | jq --raw-output '.master."x86_64-linux".tarball' \ - | wget -q --show-progress -i -; \ + | wget -q -i -; \ file=$(ls | grep 'zig*.*.*') && \ - tar -xvf $file &&\ + tar -xf $file &&\ folder=$file \ folder=${folder%.*.*} &&\ - mkdir -p $ZIG_HOME/{bin,lib/zig} &&\ - mv $folder/lib/* $ZIG_HOME/lib/zig &&\ - mv $folder/zig $ZIG_HOME/bin &&\ - rm -rf $folder && echo -e "Zig version: $($ZIG_HOME/bin/zig version)\n" + mkdir -p $ZIG_HOME/lib/zig && mkdir $ZIG_HOME/bin &&\ + 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" && echo "Zig/Clang version: $($ZIG_HOME/bin/zig cc --version)\n" Review comment: merge too -- 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: commits-unsubscr...@nuttx.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
