更新github action脚本，适应ubuntu24.04操作系统

genokolar · Jan 5, 2025 · 2a4bdaf · 2a4bdaf
1 parent 246861b
commit 2a4bdaf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
@@ -18,18 +18,17 @@ jobs:
     # 下载安装相关工具
     - name: ⚙️ Install Tools
       run: |
-        sudo apt-get update
-        sudo apt-get -y install python3-pip python3-setuptools
-        sudo pip3 install --upgrade pip
-        sudo pip3 install nrfutil
         wget https://sourceforge.net/projects/sdcc/files/sdcc-linux-amd64/4.0.0/sdcc-4.0.0-amd64-unknown-linux2.5.tar.bz2 -O /tmp/sdcc-4.0.0-amd64-unknown-linux2.5.tar.bz2
         tar xf /tmp/sdcc-4.0.0-amd64-unknown-linux2.5.tar.bz2 -C /tmp
         sudo cp -r /tmp/sdcc-4.0.0/* /usr/local
         wget https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2 -O /tmp/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2
         tar xf /tmp/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2 -C /tmp
         wget https://github.com/genokolar/nrf52_tools/raw/main/mergehex -O /tmp/mergehex
         sudo cp -r /tmp/mergehex /usr/local/bin/mergehex
+        wget https://github.com/genokolar/nrf52_tools/raw/main/nrfutil-linux -O /tmp/nrfutil
+        sudo cp -r /tmp/nrfutil /usr/local/bin/nrfutil
         sudo chmod 0755 /usr/local/bin/mergehex
+        sudo chmod 0755 /usr/local/bin/nrfutil
         echo GNU_INSTALL_ROOT := /tmp/gcc-arm-none-eabi-9-2019-q4-major/bin/>template/Makefile.posix
         echo GNU_VERSION := 9.2.1>>template/Makefile.posix
         echo GNU_PREFIX := arm-none-eabi>>template/Makefile.posix

diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
@@ -17,18 +17,17 @@ jobs:
     # 下载安装相关工具
     - name: ⚙️ Install Tools
       run: |
-        sudo apt-get update
-        sudo apt-get -y install python3-pip python3-setuptools
-        sudo pip3 install --upgrade pip
-        sudo pip3 install nrfutil
         wget https://sourceforge.net/projects/sdcc/files/sdcc-linux-amd64/4.0.0/sdcc-4.0.0-amd64-unknown-linux2.5.tar.bz2 -O /tmp/sdcc-4.0.0-amd64-unknown-linux2.5.tar.bz2
         tar xf /tmp/sdcc-4.0.0-amd64-unknown-linux2.5.tar.bz2 -C /tmp
         sudo cp -r /tmp/sdcc-4.0.0/* /usr/local
         wget https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2 -O /tmp/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2
         tar xf /tmp/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2 -C /tmp
         wget https://github.com/genokolar/nrf52_tools/raw/main/mergehex -O /tmp/mergehex
         sudo cp -r /tmp/mergehex /usr/local/bin/mergehex
+        wget https://github.com/genokolar/nrf52_tools/raw/main/nrfutil-linux -O /tmp/nrfutil
+        sudo cp -r /tmp/nrfutil /usr/local/bin/nrfutil
         sudo chmod 0755 /usr/local/bin/mergehex
+        sudo chmod 0755 /usr/local/bin/nrfutil
         echo GNU_INSTALL_ROOT := /tmp/gcc-arm-none-eabi-9-2019-q4-major/bin/>template/Makefile.posix
         echo GNU_VERSION := 9.2.1>>template/Makefile.posix
         echo GNU_PREFIX := arm-none-eabi>>template/Makefile.posix