Skip to content

Commit 87ee720

Browse files
authored
[acition] update pkgs update script (#8108)
1 parent c021c5c commit 87ee720

File tree

4 files changed

+26
-16
lines changed

4 files changed

+26
-16
lines changed

.github/workflows/manual_dist.yml

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ jobs:
8686
shell: bash
8787
run: |
8888
sudo apt-get update
89-
sudo apt-get -qq install gcc-multilib libncurses5 libncurses5-dev libncursesw5-dev scons
90-
sudo python -m pip install --upgrade pip -qq
91-
pip install requests -qq
89+
wget https://raw.githubusercontent.com/RT-Thread/env/master/install_ubuntu.sh
90+
chmod 777 install_ubuntu.sh
91+
./install_ubuntu.sh
9292
git config --global http.postBuffer 524288000
9393
python -c "import tools.menuconfig; tools.menuconfig.touch_env()"
9494
echo "RTT_ROOT=${{ github.workspace }}" >> $GITHUB_ENV
@@ -109,10 +109,11 @@ jobs:
109109
run: |
110110
wget -q https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/download/release-16.0.0/LLVMEmbeddedToolchainForArm-16.0.0-Linux-x86_64.tar.gz
111111
sudo tar zxf LLVMEmbeddedToolchainForArm-16.0.0-Linux-x86_64.tar.gz -C /opt
112+
sudo apt-get -qq install libncurses5 libncurses5-dev libncursesw5-dev
112113
/opt/LLVMEmbeddedToolchainForArm-16.0.0-Linux-x86_64/bin/clang --version
113114
echo "RTT_CC=llvm-arm" >> $GITHUB_ENV
114115
echo "RTT_EXEC_PATH=/opt/LLVMEmbeddedToolchainForArm-16.0.0-Linux-x86_64/bin" >> $GITHUB_ENV
115-
116+
116117
- name: Install AArch64 ToolChains
117118
if: ${{ github.event.inputs.bsp_tool_chain == 'sourcery-aarch64' && success() }}
118119
shell: bash
@@ -147,8 +148,17 @@ jobs:
147148
/opt/xpack-riscv-none-embed-gcc-8.3.0-2.3/bin/riscv-none-embed-gcc --version
148149
echo "RTT_EXEC_PATH=/opt/xpack-riscv-none-embed-gcc-8.3.0-2.3/bin" >> $GITHUB_ENV
149150
150-
- name: Install Simulator Tools
151-
if: ${{ github.event.inputs.bsp_options == 'simulator' && success() }}
151+
- name: Install riscv32-esp-elf ToolChains
152+
if: ${{ github.event.inputs.bsp_tool_chain == 'sourcery-riscv32-esp32' && success() }}
153+
run: |
154+
wget -q https://github.com/espressif/crosstool-NG/releases/download/esp-2022r1-RC1/riscv32-esp-elf-gcc11_2_0-esp-2022r1-RC1-linux-amd64.tar.xz
155+
sudo tar xf riscv32-esp-elf-gcc11_2_0-esp-2022r1-RC1-linux-amd64.tar.xz -C /opt
156+
/opt/riscv32-esp-elf/bin/riscv32-esp-elf-gcc --version
157+
pip3 install esptool
158+
echo "RTT_EXEC_PATH=/opt/riscv32-esp-elf/bin" >> $GITHUB_ENV
159+
160+
- name: Install GCC Tools
161+
if: ${{ github.event.inputs.bsp_tool_chain == 'gcc' && success() }}
152162
run: |
153163
sudo apt-get -qq install libsdl2-dev
154164

.github/workflows/manual_trigger_scons_STM32_all.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@ jobs:
135135
shell: bash
136136
run: |
137137
sudo apt-get update
138-
sudo apt-get -qq install gcc-multilib libncurses5-dev scons
139-
sudo python -m pip install --upgrade pip -qq
140-
pip install requests -qq
138+
wget https://raw.githubusercontent.com/RT-Thread/env/master/install_ubuntu.sh
139+
chmod 777 install_ubuntu.sh
140+
./install_ubuntu.sh
141141
git config --global http.postBuffer 524288000
142142
python -c "import tools.menuconfig; tools.menuconfig.touch_env()"
143143
echo "RTT_ROOT=${{ github.workspace }}" >> $GITHUB_ENV

.github/workflows/manual_trigger_scons_except_STM32_all.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -284,9 +284,9 @@ jobs:
284284
shell: bash
285285
run: |
286286
sudo apt-get update
287-
sudo apt-get -qq install gcc-multilib libncurses5-dev scons
288-
sudo python -m pip install --upgrade pip -qq
289-
pip install requests -qq
287+
wget https://raw.githubusercontent.com/RT-Thread/env/master/install_ubuntu.sh
288+
chmod 777 install_ubuntu.sh
289+
./install_ubuntu.sh
290290
git config --global http.postBuffer 524288000
291291
python -c "import tools.menuconfig; tools.menuconfig.touch_env()"
292292
echo "RTT_ROOT=${{ github.workspace }}" >> $GITHUB_ENV
@@ -346,7 +346,7 @@ jobs:
346346
wget -q https://github.com/espressif/crosstool-NG/releases/download/esp-2022r1-RC1/riscv32-esp-elf-gcc11_2_0-esp-2022r1-RC1-linux-amd64.tar.xz
347347
sudo tar xf riscv32-esp-elf-gcc11_2_0-esp-2022r1-RC1-linux-amd64.tar.xz -C /opt
348348
/opt/riscv32-esp-elf/bin/riscv32-esp-elf-gcc --version
349-
/usr/bin/pip install esptool
349+
pip3 install esptool
350350
echo "RTT_EXEC_PATH=/opt/riscv32-esp-elf/bin" >> $GITHUB_ENV
351351
352352
- name: Bsp Scons Compile

.github/workflows/manual_trigger_scons_fail_bsp_all.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,9 @@ jobs:
114114
shell: bash
115115
run: |
116116
sudo apt-get update
117-
sudo apt-get -qq install gcc-multilib libncurses5-dev scons
118-
sudo python -m pip install --upgrade pip -qq
119-
pip install requests -qq
117+
wget https://raw.githubusercontent.com/RT-Thread/env/master/install_ubuntu.sh
118+
chmod 777 install_ubuntu.sh
119+
./install_ubuntu.sh
120120
git config --global http.postBuffer 524288000
121121
python -c "import tools.menuconfig; tools.menuconfig.touch_env()"
122122
echo "RTT_ROOT=${{ github.workspace }}" >> $GITHUB_ENV

0 commit comments

Comments
 (0)