Skip to content

Commit 26cc1db

Browse files
supperthomassupperthomas
authored
Update manual_dist.yml
1 parent adebea0 commit 26cc1db

File tree

1 file changed

+22
-28
lines changed

1 file changed

+22
-28
lines changed

‎.github/workflows/manual_dist.yml‎

Lines changed: 22 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -83,55 +83,43 @@ jobs:
8383
if: ${{ github.event.inputs.bsp_tool_chain == 'llvm-arm' && success() }}
8484
shell: bash
8585
run: |
86-
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
87-
sudo tar zxf LLVMEmbeddedToolchainForArm-16.0.0-Linux-x86_64.tar.gz -C /opt
88-
sudo apt-get -qq install libncurses5 libncurses5-dev libncursesw5-dev
89-
/opt/LLVMEmbeddedToolchainForArm-16.0.0-Linux-x86_64/bin/clang --version
86+
source tools/ci/toolchain.sh clang
87+
echo "RTT_EXEC_PATH=/opt/clang/bin" >> $GITHUB_ENV
9088
echo "RTT_CC=llvm-arm" >> $GITHUB_ENV
91-
echo "RTT_EXEC_PATH=/opt/LLVMEmbeddedToolchainForArm-16.0.0-Linux-x86_64/bin" >> $GITHUB_ENV
9289
9390
- name: Install AArch64 ToolChains
9491
if: ${{ github.event.inputs.bsp_tool_chain == 'sourcery-aarch64' && success() }}
9592
shell: bash
9693
run: |
97-
wget -q https://github.com/RT-Thread/toolchains-ci/releases/download/v1.6/gcc-arm-10.2-2020.11-x86_64-aarch64-none-elf.tar.xz
98-
sudo tar -xf gcc-arm-10.2-2020.11-x86_64-aarch64-none-elf.tar.xz -C /opt
99-
/opt/gcc-arm-10.2-2020.11-x86_64-aarch64-none-elf/bin/aarch64-none-elf-gcc --version
100-
echo "RTT_EXEC_PATH=/opt/gcc-arm-10.2-2020.11-x86_64-aarch64-none-elf/bin" >> $GITHUB_ENV
94+
source tools/ci/toolchain.sh aarch64-none-elf-gcc
95+
echo "RTT_EXEC_PATH=/opt/aarch64-none-elf-gcc/bin" >> $GITHUB_ENV
10196
10297
- name: Install Mips ToolChains
10398
if: ${{ github.event.inputs.bsp_tool_chain == 'sourcery-mips' && success() }}
10499
shell: bash
105100
run: |
106-
wget -q https://github.com/RT-Thread/toolchains-ci/releases/download/v1.1/mips-2016.05-7-mips-sde-elf-i686-pc-linux-gnu.tar.bz2
107-
sudo tar xjf mips-2016.05-7-mips-sde-elf-i686-pc-linux-gnu.tar.bz2 -C /opt
108-
/opt/mips-2016.05/bin/mips-sde-elf-gcc --version
109-
echo "RTT_EXEC_PATH=/opt/mips-2016.05/bin" >> $GITHUB_ENV
101+
source tools/ci/toolchain.sh mips-sde-elf-gcc
102+
echo "RTT_EXEC_PATH=/opt/mips-sde-elf-gcc/bin" >> $GITHUB_ENV
110103
111104
- name: Install Riscv64-unknown-elf ToolChains
112105
if: ${{ github.event.inputs.bsp_tool_chain == 'sourcery-riscv64-unknown-elf' && success() }}
113106
run: |
114-
wget -q https://github.com/RT-Thread/toolchains-ci/releases/download/v1.4/riscv64-unknown-elf-toolchain-10.2.0-2020.12.8-x86_64-linux-ubuntu14.tar.gz
115-
sudo tar zxf riscv64-unknown-elf-toolchain-10.2.0-2020.12.8-x86_64-linux-ubuntu14.tar.gz -C /opt
116-
/opt/riscv64-unknown-elf-toolchain-10.2.0-2020.12.8-x86_64-linux-ubuntu14/bin/riscv64-unknown-elf-gcc --version
117-
echo "RTT_EXEC_PATH=/opt/riscv64-unknown-elf-toolchain-10.2.0-2020.12.8-x86_64-linux-ubuntu14/bin" >> $GITHUB_ENV
107+
source tools/ci/toolchain.sh riscv64-unknown-elf-gcc
108+
echo "RTT_EXEC_PATH=/opt/riscv64-unknown-elf-gcc/bin" >> $GITHUB_ENV
118109
119110
- name: Install Riscv-none-embed ToolChains
120111
if: ${{ github.event.inputs.bsp_tool_chain == 'sourcery-riscv-none-embed' && success() }}
121112
run: |
122-
wget -q https://github.com/RT-Thread/toolchains-ci/releases/download/v1.5/xpack-riscv-none-embed-gcc-8.3.0-2.3-linux-x64.tar.gz
123-
sudo tar zxf xpack-riscv-none-embed-gcc-8.3.0-2.3-linux-x64.tar.gz -C /opt
124-
/opt/xpack-riscv-none-embed-gcc-8.3.0-2.3/bin/riscv-none-embed-gcc --version
125-
echo "RTT_EXEC_PATH=/opt/xpack-riscv-none-embed-gcc-8.3.0-2.3/bin" >> $GITHUB_ENV
113+
source tools/ci/toolchain.sh riscv-none-embed-gcc
114+
echo "RTT_EXEC_PATH=/opt/riscv-none-embed-gcc/bin" >> $GITHUB_ENV
115+
126116
127117
- name: Install riscv32-esp-elf ToolChains
128118
if: ${{ github.event.inputs.bsp_tool_chain == 'sourcery-riscv32-esp32' && success() }}
129119
run: |
130-
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
131-
sudo tar xf riscv32-esp-elf-gcc11_2_0-esp-2022r1-RC1-linux-amd64.tar.xz -C /opt
132-
/opt/riscv32-esp-elf/bin/riscv32-esp-elf-gcc --version
120+
source tools/ci/toolchain.sh riscv32-esp-elf-gcc
121+
echo "RTT_EXEC_PATH=/opt/riscv32-esp-elf-gcc/bin" >> $GITHUB_ENV
133122
pip3 install esptool
134-
echo "RTT_EXEC_PATH=/opt/riscv32-esp-elf/bin" >> $GITHUB_ENV
135123
136124
- name: Install GCC Tools
137125
if: ${{ github.event.inputs.bsp_tool_chain == 'gcc' && success() }}
@@ -157,11 +145,17 @@ jobs:
157145
scons -C bsp/$RTT_BSP -j$(nproc) --cdb
158146
ls bsp/$RTT_BSP
159147
scons --dist -C bsp/$RTT_BSP
148+
mv bsp/$RTT_BSP/dist .
160149
cppcheck --project=bsp/$RTT_BSP/build/compile_commands.json
161150
162151
- uses: actions/upload-artifact@main
163152
if: ${{ github.event.inputs.dist_flag && success()}}
164153
with:
165-
name: ${{ github.event.inputs.bsp_options }}
166-
path: ${{ github.workspace }}/bsp/${{ github.event.inputs.bsp_options }}/dist/*.zip
167-
154+
name: rtt_dist_${{ github.event.inputs.bsp_options }}
155+
path: ${{ github.workspace }}/dist/*.zip
156+
157+
- uses: actions/upload-artifact@main
158+
if: ${{ github.event.inputs.dist_flag && success()}}
159+
with:
160+
name: rtt_bsp_${{ github.event.inputs.bsp_options }}
161+
path: ${{ github.workspace }}/bsp/${{ github.event.inputs.bsp_options }}/*

0 commit comments

Comments
 (0)