Просмотр исходного кода

fix: ci的工具链提前下载好,防止报错

chenxuuu 4 лет назад
Родитель
Сommit
8a5bc87815
2 измененных файлов с 6 добавлено и 8 удалено
  1. 3 4
      .github/workflows/air101.yml
  2. 3 4
      .github/workflows/air105.yml

+ 3 - 4
.github/workflows/air101.yml

@@ -23,10 +23,6 @@ jobs:
         sudo add-apt-repository ppa:xmake-io/xmake -y
         sudo apt update
         sudo apt install xmake
-        wget -q https://github.com/openLuat/LuatOS/releases/download/v0.0.1/csky-elfabiv2-tools-x86_64-minilibc-20210423.tar.gz
-        sudo mkdir /opt/csky-elfabiv2-tools
-        sudo tar zxvf csky-elfabiv2-tools-x86_64-minilibc-20210423.tar.gz -C /opt/csky-elfabiv2-tools
-        rm csky-elfabiv2-tools-x86_64-minilibc-20210423.tar.gz
     - name: clone 101
       env:
         AIR101REPO: ${{ secrets.AIR101REPO }}
@@ -39,6 +35,9 @@ jobs:
         cd ../air101
         gcc -o tools/xt804/wm_tool tools/xt804/wm_tool.c -pthread
         chmod +x tools/xt804/wm_tool
+        mkdir ~/toolchains
+        wget -q https://github.com/openLuat/LuatOS/releases/download/v0.0.1/csky-elfabiv2-tools-x86_64-minilibc-20210423.tar.gz -O ~/toolchains/csky-elfabiv2-tools-x86_64-minilibc-20210423.tar.gz
+        xmake g --pkg_searchdirs=~/toolchains
         xmake -y
         mkdir ../LuatOS/luatosfw
         mv build/out/*.soc ../LuatOS/luatosfw

+ 3 - 4
.github/workflows/air105.yml

@@ -23,10 +23,6 @@ jobs:
         sudo add-apt-repository ppa:xmake-io/xmake -y
         sudo apt update
         sudo apt install xmake
-        wget -q https://github.com/openLuat/LuatOS/releases/download/v0.0.1/gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2
-        sudo tar xjf gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2 -C /opt
-        /opt/gcc-arm-none-eabi-10.3-2021.10/bin/arm-none-eabi-gcc --version
-        rm gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2
     - name: clone 105
       env:
         AIR105REPO: ${{ secrets.AIR105REPO }}
@@ -37,6 +33,9 @@ jobs:
     - name: make
       run: |
         cd ../air105/core
+        mkdir ~/toolchains
+        wget -q https://github.com/openLuat/LuatOS/releases/download/v0.0.1/gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2 -O -O ~/toolchains/gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2
+        xmake g --pkg_searchdirs=-O ~/toolchains
         xmake -y
         mkdir ../../LuatOS/luatosfw
         mv build/out/*.soc ../../LuatOS/luatosfw