You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@nuttx.apache.org by xi...@apache.org on 2023/12/10 14:39:39 UTC

(nuttx) 02/02: ci/docker: Revert the change about gn to unblock ci

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git

commit 69e413c678f05bbe22bfb67632d95d82dbc685a8
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Dec 10 14:12:02 2023 +0800

    ci/docker: Revert the change about gn to unblock ci
    
    Revert "ci/docker: Fix " Could not find GN_EXECUTABLEXX using the following names: gn""
    This reverts commit d6ac9e1aedb5366a9d8e91544ca1c27095c0b7b7.
    
    Revert "tools/ci: Skip copy gn temporary files"
    This reverts commit 4673fccece7cd10d0d5da9ef42b02d0aedac2c36.
---
 tools/ci/docker/linux/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/ci/docker/linux/Dockerfile b/tools/ci/docker/linux/Dockerfile
index aab8ef688e..26a1278d53 100644
--- a/tools/ci/docker/linux/Dockerfile
+++ b/tools/ci/docker/linux/Dockerfile
@@ -417,8 +417,8 @@ ENV WASI_SDK_PATH="/tools/wasi-sdk"
 ENV PATH="/tools/wamr:$PATH"
 
 # gn tool
-COPY --from=nuttx-tools /tools/gn/ /tools/gn/gn/out/
-ENV PATH="/tools/gn:$PATH"
+COPY --from=nuttx-tools /tools/gn/ /tools/gn/
+ENV PATH="/tools/gn/gn/out:$PATH"
 
 # ZAP tool and nodejs packet
 COPY --from=nuttx-tools /tools/zap/ /tools/zap/