diff options
| -rw-r--r-- | .github/workflows/main2.yml | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/.github/workflows/main2.yml b/.github/workflows/main2.yml index 731d0f3..ba80340 100644 --- a/.github/workflows/main2.yml +++ b/.github/workflows/main2.yml @@ -25,17 +25,7 @@ jobs: runs-on: ubuntu-latest steps: - - - name: Install adafruit-nrfutil - run: | - pip3 install --user wheel - pip3 install --user setuptools - pip3 install --user adafruit-nrfutil - pip3 show adafruit-nrfutil - pip3 -V - ls -l ~/.local/bin - ~/.local/bin/adafruit-nrfutil --help - + ######################################################################################### # Download and Cache Dependencies @@ -115,9 +105,19 @@ jobs: - name: Make pinetime-mcuboot-app run: cd build && make pinetime-mcuboot-app - - name: Install adafruit-nrfutil and imgtool dependencies - run: pip3 install --user wheel && pip3 install --user setuptools && pip3 install --user adafruit-nrfutil && pip3 install --user -r ${{ runner.temp }}/mcuboot/scripts/requirements.txt + - name: Install imgtool dependencies + run: pip3 install --user -r ${{ runner.temp }}/mcuboot/scripts/requirements.txt + - name: Install adafruit-nrfutil + run: | + pip3 install --user wheel + pip3 install --user setuptools + pip3 install --user adafruit-nrfutil + pip3 show adafruit-nrfutil + pip3 -V + ls -l ~/.local/bin + ~/.local/bin/adafruit-nrfutil --help + - name: Create firmware image run: ${{ runner.temp }}/mcuboot/scripts/imgtool.py create --align 4 --version 1.0.0 --header-size 32 --slot-size 475136 --pad-header build/src/pinetime-mcuboot-app.bin build/src/pinetime-mcuboot-app.img @@ -125,7 +125,7 @@ jobs: run: ${{ runner.temp }}/mcuboot/scripts/imgtool.py verify build/src/pinetime-mcuboot-app.img - name: Create DFU package - run: adafruit-nrfutil dfu genpkg --dev-type 0x0052 --application build/src/pinetime-mcuboot-app.img build/src/pinetime-mcuboot-app-dfu.zip + run: ~/.local/bin/adafruit-nrfutil dfu genpkg --dev-type 0x0052 --application build/src/pinetime-mcuboot-app.img build/src/pinetime-mcuboot-app-dfu.zip - name: Upload pinetime-mcuboot-app uses: actions/upload-artifact@v2 |