From 96085cc377b80bf8fbd173598edcdc51632ae036 Mon Sep 17 00:00:00 2001 From: mazhiyuan Date: Mon, 25 Oct 2021 13:45:56 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0CI=E4=B8=ADpkgs=20--updat?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/action.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml index 606d381208..94e3009725 100644 --- a/.github/workflows/action.yml +++ b/.github/workflows/action.yml @@ -151,7 +151,9 @@ jobs: shell: bash run: | sudo apt-get update - sudo apt-get -qq install gcc-multilib libsdl-dev scons + sudo apt-get -qq install gcc-multilib libsdl-dev libncurses5-dev scons + sudo python -m pip install --upgrade pip -qq + sudo pip install requests -qq echo "RTT_ROOT=${{ github.workspace }}" >> $GITHUB_ENV echo "RTT_CC=gcc" >> $GITHUB_ENV @@ -196,4 +198,6 @@ jobs: RTT_BSP: ${{ matrix.legs.RTT_BSP }} RTT_TOOL_CHAIN: ${{ matrix.legs.RTT_TOOL_CHAIN }} run: | + python -c "import tools.menuconfig; tools.menuconfig.touch_env()" + pushd bsp/$RTT_BSP && pkgs --update && popd scons -C bsp/$RTT_BSP From ae1988e54dcf6d867f1385e77f4072d576748ecd Mon Sep 17 00:00:00 2001 From: mazhiyuan Date: Mon, 25 Oct 2021 14:03:08 +0800 Subject: [PATCH 2/5] add source ~/.env/env.sh for ci --- .github/workflows/action.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml index 94e3009725..6617fdd1ac 100644 --- a/.github/workflows/action.yml +++ b/.github/workflows/action.yml @@ -154,6 +154,8 @@ jobs: sudo apt-get -qq install gcc-multilib libsdl-dev libncurses5-dev scons sudo python -m pip install --upgrade pip -qq sudo pip install requests -qq + python -c "import tools.menuconfig; tools.menuconfig.touch_env()" + source ~/.env/env.sh echo "RTT_ROOT=${{ github.workspace }}" >> $GITHUB_ENV echo "RTT_CC=gcc" >> $GITHUB_ENV @@ -198,6 +200,5 @@ jobs: RTT_BSP: ${{ matrix.legs.RTT_BSP }} RTT_TOOL_CHAIN: ${{ matrix.legs.RTT_TOOL_CHAIN }} run: | - python -c "import tools.menuconfig; tools.menuconfig.touch_env()" pushd bsp/$RTT_BSP && pkgs --update && popd scons -C bsp/$RTT_BSP From a2f99ded3b3a34dffc4e6e7610015ee4f4edd21e Mon Sep 17 00:00:00 2001 From: mazhiyuan Date: Mon, 25 Oct 2021 15:23:19 +0800 Subject: [PATCH 3/5] update action.yml --- .github/workflows/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml index 6617fdd1ac..62e5752784 100644 --- a/.github/workflows/action.yml +++ b/.github/workflows/action.yml @@ -155,7 +155,6 @@ jobs: sudo python -m pip install --upgrade pip -qq sudo pip install requests -qq python -c "import tools.menuconfig; tools.menuconfig.touch_env()" - source ~/.env/env.sh echo "RTT_ROOT=${{ github.workspace }}" >> $GITHUB_ENV echo "RTT_CC=gcc" >> $GITHUB_ENV @@ -200,5 +199,6 @@ jobs: RTT_BSP: ${{ matrix.legs.RTT_BSP }} RTT_TOOL_CHAIN: ${{ matrix.legs.RTT_TOOL_CHAIN }} run: | + source ~/.env/env.sh pushd bsp/$RTT_BSP && pkgs --update && popd scons -C bsp/$RTT_BSP From 976fb46ea19c5af0ea797ac93bf016bc796ae5b7 Mon Sep 17 00:00:00 2001 From: mazhiyuan Date: Mon, 25 Oct 2021 15:35:46 +0800 Subject: [PATCH 4/5] test --- .github/workflows/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml index 62e5752784..97b6a9928b 100644 --- a/.github/workflows/action.yml +++ b/.github/workflows/action.yml @@ -152,8 +152,8 @@ jobs: run: | sudo apt-get update sudo apt-get -qq install gcc-multilib libsdl-dev libncurses5-dev scons - sudo python -m pip install --upgrade pip -qq - sudo pip install requests -qq + sudo python -m pip install --upgrade pip + sudo pip install requests python -c "import tools.menuconfig; tools.menuconfig.touch_env()" echo "RTT_ROOT=${{ github.workspace }}" >> $GITHUB_ENV echo "RTT_CC=gcc" >> $GITHUB_ENV From e85a951ee7f5d938903524796506686c6f938e62 Mon Sep 17 00:00:00 2001 From: mazhiyuan Date: Mon, 25 Oct 2021 15:50:55 +0800 Subject: [PATCH 5/5] =?UTF-8?q?pip=E5=8E=BB=E6=8E=89sudo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml index 97b6a9928b..056f5a0670 100644 --- a/.github/workflows/action.yml +++ b/.github/workflows/action.yml @@ -152,8 +152,8 @@ jobs: run: | sudo apt-get update sudo apt-get -qq install gcc-multilib libsdl-dev libncurses5-dev scons - sudo python -m pip install --upgrade pip - sudo pip install requests + sudo python -m pip install --upgrade pip -qq + pip install requests -qq python -c "import tools.menuconfig; tools.menuconfig.touch_env()" echo "RTT_ROOT=${{ github.workspace }}" >> $GITHUB_ENV echo "RTT_CC=gcc" >> $GITHUB_ENV