diff options
| author | JF <jf@codingfield.com> | 2022-01-07 16:31:01 (GMT) |
|---|---|---|
| committer | Gitea <gitea@fake.local> | 2022-01-07 16:31:01 (GMT) |
| commit | adc7909c9823c5cd9fc9888a84e84f9182b9088f (patch) | |
| tree | 778abfb7792fb7e58e3ec4408c9e56444f383e25 /.github/workflows | |
| parent | cfef0131b7b1bb83c81db417c43d6d499594125f (diff) | |
| parent | 26ae828e393d28390c5ea718bec9d4c1a96435ac (diff) | |
Merge branch 'develop' of JF/PineTime into master
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/main.yml | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3b753a3..58a6393 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 -G Ninja -DARM_NONE_EABI_TOOLCHAIN_PATH=${{ runner.temp }}/arm-none-eabi -DNRF5_SDK_PATH=${{ runner.temp }}/nrf5_sdk -DUSE_OPENOCD=1 -DBUILD_DFU=1 ../ ######################################################################################### # Make and Upload DFU Package @@ -125,8 +125,7 @@ jobs: - name: Make pinetime-mcuboot-app run: | - cd build - make pinetime-mcuboot-app + cmake --build build --target pinetime-mcuboot-app - name: Unzip DFU package run: | @@ -144,8 +143,7 @@ jobs: - name: Make pinetime-app run: | - cd build - make pinetime-app + cmake --build build --target pinetime-app - name: Upload standalone firmware uses: actions/upload-artifact@v2 @@ -158,8 +156,7 @@ jobs: - name: Make pinetime-recovery run: | - cd build - make pinetime-recovery + cmake --build build --target pinetime-recovery ######################################################################################### # Finish |