From 215c229c0e54237923a0bb0f18a416a68636b146 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Milants?= Date: Tue, 19 Oct 2021 20:07:42 +0200 Subject: [PATCH] Do not install cmake and toolchain (the original workflow file download the x86 version, but we are running on aarch64). --- .github/workflows/main.yml | 40 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f6e513c4..64b5e239 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,27 +29,27 @@ jobs: ######################################################################################### # Download and Cache Dependencies - - name: Install cmake - uses: lukka/get-cmake@v3.18.3 + #- name: Install cmake + # uses: lukka/get-cmake@v3.18.3 - - name: Check cache for Embedded Arm Toolchain arm-none-eabi-gcc - id: cache-toolchain - uses: actions/cache@v2 - env: - cache-name: cache-toolchain-9-2020-q2 - with: - path: ${{ runner.temp }}/arm-none-eabi - key: ${{ runner.os }}-build-${{ env.cache-name }} - restore-keys: ${{ runner.os }}-build-${{ env.cache-name }} + #- name: Check cache for Embedded Arm Toolchain arm-none-eabi-gcc + # id: cache-toolchain + # uses: actions/cache@v2 + # env: + # cache-name: cache-toolchain-9-2020-q2 + # with: + # path: ${{ runner.temp }}/arm-none-eabi + # key: ${{ runner.os }}-build-${{ env.cache-name }} + # restore-keys: ${{ runner.os }}-build-${{ env.cache-name }} - - name: Install Embedded Arm Toolchain arm-none-eabi-gcc - if: steps.cache-toolchain.outputs.cache-hit != 'true' # Install toolchain if not found in cache - uses: fiam/arm-none-eabi-gcc@v1.0.4 - with: - # GNU Embedded Toolchain for Arm release name, in the V-YYYY-qZ format (e.g. "9-2019-q4") - release: 9-2020-q2 - # Directory to unpack GCC to. Defaults to a temporary directory. - directory: ${{ runner.temp }}/arm-none-eabi + #- name: Install Embedded Arm Toolchain arm-none-eabi-gcc + # if: steps.cache-toolchain.outputs.cache-hit != 'true' # Install toolchain if not found in cache + # uses: fiam/arm-none-eabi-gcc@v1.0.4 + # with: + # # GNU Embedded Toolchain for Arm release name, in the V-YYYY-qZ format (e.g. "9-2019-q4") + # release: 9-2020-q2 + # # Directory to unpack GCC to. Defaults to a temporary directory. + # directory: ${{ runner.temp }}/arm-none-eabi - name: Check cache for nRF5 SDK id: cache-nrf5sdk @@ -113,7 +113,7 @@ jobs: run: | mkdir -p build cd build - cmake -DARM_NONE_EABI_TOOLCHAIN_PATH=${{ runner.temp }}/arm-none-eabi -DNRF5_SDK_PATH=${{ runner.temp }}/nrf5_sdk -DUSE_OPENOCD=1 -DBUILD_DFU=1 ../ + cmake -DARM_NONE_EABI_TOOLCHAIN_PATH=/home/alarm/nrf52/gcc-arm-none-eabi-9-2020-q2-update/arm-none-eabi -DNRF5_SDK_PATH=${{ runner.temp }}/nrf5_sdk -DUSE_OPENOCD=1 -DBUILD_DFU=1 ../ ######################################################################################### # Make and Upload DFU Package