CI: use more standard install

tock · Dec 19, 2023 · 6dc8907 · 6dc8907
1 parent 676b550
commit 6dc8907
Showing 1 changed file with 9 additions and 47 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
   ci-format:
     strategy:
       matrix:
-        os: [ubuntu-20.04]
+        os: [ubuntu-22.04]
     # The type of runner that the job will run on
     runs-on: ${{ matrix.os }}
 
@@ -21,37 +21,18 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: false # LVGL makefile manually installs the submodule
-      - uses: fiam/arm-none-eabi-gcc@v1
+      - uses: carlosperate/arm-none-eabi-gcc-action@v1
         with:
-          release: '10-2020-q4' # The arm-none-eabi-gcc release to use.
+          release: '10.3-2021.07' # The arm-none-eabi-gcc release to use.
       - name: setup-riscv-toolchain
-        run: |
-          RISCV_TOOLCHAIN_MIRRORS=(\
-            "http://www.cs.virginia.edu/~bjc8c/archive/gcc-riscv64-unknown-elf-8.3.0-ubuntu.zip" \
-            "https://alpha.mirror.svc.schuermann.io/files/2023-08-17_gcc-riscv64-unknown-elf-8.3.0-ubuntu.zip"\
-          )
-          pushd $HOME
-          for MIRROR in ${RISCV_TOOLCHAIN_MIRRORS[@]}; do
-            echo "Fetching RISC-V toolchain from ${MIRROR}..."
-            wget -Oriscv-toolchain.zip -q "$MIRROR" &&\
-              (echo "2c82a8f3ac77bf2b24d66abff3aa5e873750c76de24c77e12dae91b9d2f4da27 riscv-toolchain.zip" |\
-                sha256sum -c)
-            if [ $? -ne 0 ]; then
-              echo "WARNING: Fetching RISC-V from mirror $MIRROR failed!" >&2
-            else
-              break
-            fi
-          done
-          unzip riscv-toolchain.zip
-          echo "$HOME/gcc-riscv64-unknown-elf-8.3.0-ubuntu/bin" >> $GITHUB_PATH
-          popd
+        run: sudo apt-get install -y gcc-riscv64-unknown-elf
       - name: ci-format
         run: pushd examples; ./format_all.sh || exit; popd
 
   ci-build:
     strategy:
       matrix:
-        os: [ubuntu-20.04]
+        os: [ubuntu-22.04]
     # The type of runner that the job will run on
     runs-on: ${{ matrix.os }}
 
@@ -60,31 +41,12 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: recursive
-      - uses: fiam/arm-none-eabi-gcc@v1
+      - uses: carlosperate/arm-none-eabi-gcc-action@v1
         with:
-          release: '10-2020-q4' # The arm-none-eabi-gcc release to use.
+          release: '10.3-2021.07' # The arm-none-eabi-gcc release to use.
       - name: setup-riscv-toolchain
-        run: |
-          RISCV_TOOLCHAIN_MIRRORS=(\
-            "http://www.cs.virginia.edu/~bjc8c/archive/gcc-riscv64-unknown-elf-8.3.0-ubuntu.zip" \
-            "https://alpha.mirror.svc.schuermann.io/files/2023-08-17_gcc-riscv64-unknown-elf-8.3.0-ubuntu.zip"\
-          )
-          pushd $HOME
-          for MIRROR in ${RISCV_TOOLCHAIN_MIRRORS[@]}; do
-            echo "Fetching RISC-V toolchain from ${MIRROR}..."
-            wget -Oriscv-toolchain.zip -q "$MIRROR" &&\
-              (echo "2c82a8f3ac77bf2b24d66abff3aa5e873750c76de24c77e12dae91b9d2f4da27 riscv-toolchain.zip" |\
-                sha256sum -c)
-            if [ $? -ne 0 ]; then
-              echo "WARNING: Fetching RISC-V from mirror $MIRROR failed!" >&2
-            else
-              break
-            fi
-          done
-          unzip riscv-toolchain.zip
-          echo "$HOME/gcc-riscv64-unknown-elf-8.3.0-ubuntu/bin" >> $GITHUB_PATH
-          popd
+        run: sudo apt-get install -y gcc-riscv64-unknown-elf
       - name: ci-build
-        run: pushd examples; RISCV=1 ./build_all.sh || exit; popd
+        run: pushd examples; ./build_all.sh || exit; popd
       - name: ci-debug-build
         run: pushd examples/blink; make debug RAM_START=0x20004000 FLASH_INIT=0x30051 || exit; popd