diff options
| -rw-r--r-- | .github/workflows/main.yml | 6 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 67681463..81926a91 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,7 +30,7 @@ jobs: # Download and Cache Dependencies - name: Install cmake - uses: lukka/get-cmake@v3.18.0 + uses: lukka/get-cmake@v3.18.3 - name: Check cache for Embedded Arm Toolchain arm-none-eabi-gcc id: cache-toolchain @@ -142,7 +142,7 @@ jobs: - name: Upload DFU package uses: actions/upload-artifact@v2 with: - name: pinetime-mcuboot-app-dfu.zip + name: pinetime-mcuboot-app-dfu path: build/src/pinetime-mcuboot-app-dfu/* ######################################################################################### @@ -168,4 +168,4 @@ jobs: find . -name "pinetime-mcuboot-app.*" -ls # Embedded Arm Toolchain and nRF5 SDK will only be cached if the build succeeds. -# So make sure that the first build always succeeds, e.g. comment out the "Make" step.
\ No newline at end of file +# So make sure that the first build always succeeds, e.g. comment out the "Make" step. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6c9ce24b..254fabcf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -713,7 +713,7 @@ if (USE_JLINK) ) add_custom_target("FLASH_${EXECUTABLE_NAME}" DEPENDS ${EXECUTABLE_NAME} - COMMAND ${NRFJPROG} --program ${EXECUTABLE_NAME}.hex -f ${NRF_TARGET} --sectorerase + COMMAND ${NRFJPROG} --program ${EXECUTABLE_FILE_NAME}.hex -f ${NRF_TARGET} --sectorerase COMMAND sleep 0.5s COMMAND ${NRFJPROG} --reset -f ${NRF_TARGET} COMMENT "flashing ${EXECUTABLE_NAME}.hex" |