rei-forks
/
InfiniTime
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Do not install cmake and toolchain (the original workflow file download the x86 version, but we are running on aarch64).

This commit is contained in:
Jean-François Milants 2021-10-19 20:07:42 +02:00
parent e77f3c9bdf
commit 215c229c0e
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
.github/workflows/main.yml vendored
View File

@ -29,27 +29,27 @@ jobs:
######################################################################################### #########################################################################################
# Download and Cache Dependencies # Download and Cache Dependencies
- name: Install cmake #- name: Install cmake
uses: lukka/get-cmake@v3.18.3 # uses: lukka/get-cmake@v3.18.3
- name: Check cache for Embedded Arm Toolchain arm-none-eabi-gcc #- name: Check cache for Embedded Arm Toolchain arm-none-eabi-gcc
id: cache-toolchain # id: cache-toolchain
uses: actions/cache@v2 # uses: actions/cache@v2
env: # env:
cache-name: cache-toolchain-9-2020-q2 # cache-name: cache-toolchain-9-2020-q2
with: # with:
path: ${{ runner.temp }}/arm-none-eabi # path: ${{ runner.temp }}/arm-none-eabi
key: ${{ runner.os }}-build-${{ env.cache-name }} # key: ${{ runner.os }}-build-${{ env.cache-name }}
restore-keys: ${{ runner.os }}-build-${{ env.cache-name }} # restore-keys: ${{ runner.os }}-build-${{ env.cache-name }}
- name: Install Embedded Arm Toolchain arm-none-eabi-gcc #- name: Install Embedded Arm Toolchain arm-none-eabi-gcc
if: steps.cache-toolchain.outputs.cache-hit != 'true' # Install toolchain if not found in cache # if: steps.cache-toolchain.outputs.cache-hit != 'true' # Install toolchain if not found in cache
uses: fiam/arm-none-eabi-gcc@v1.0.4 # uses: fiam/arm-none-eabi-gcc@v1.0.4
with: # with:
# GNU Embedded Toolchain for Arm release name, in the V-YYYY-qZ format (e.g. "9-2019-q4") # # GNU Embedded Toolchain for Arm release name, in the V-YYYY-qZ format (e.g. "9-2019-q4")
release: 9-2020-q2 # release: 9-2020-q2
# Directory to unpack GCC to. Defaults to a temporary directory. # # Directory to unpack GCC to. Defaults to a temporary directory.
directory: ${{ runner.temp }}/arm-none-eabi # directory: ${{ runner.temp }}/arm-none-eabi
- name: Check cache for nRF5 SDK - name: Check cache for nRF5 SDK
id: cache-nrf5sdk id: cache-nrf5sdk
@ -113,7 +113,7 @@ jobs:
run: | run: |
mkdir -p build mkdir -p build
cd 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 # Make and Upload DFU Package