From 22e98a24c5826ddc12fa9b95bb036630baaeb80c Mon Sep 17 00:00:00 2001 From: TheSomeMan Date: Sun, 20 Oct 2024 23:18:29 +0700 Subject: [PATCH] Improve release building - add checking for uncommitted changes (#67) (#68) * Improve release building - add checking for uncommitted changes (#67) * Improve release building - add checking for uncommitted changes (#67) --- .github/workflows/build-fw.yml | 10 ++++++---- .github/workflows/build-release.yml | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-fw.yml b/.github/workflows/build-fw.yml index c113be1..2674c08 100644 --- a/.github/workflows/build-fw.yml +++ b/.github/workflows/build-fw.yml @@ -33,8 +33,9 @@ jobs: - name: Install nRF Command Line Tools run: | - wget -q https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/desktop-software/nrf-command-line-tools/sw/versions-10-x-x/10-24-2/nrf-command-line-tools_10.24.2_amd64.deb - sudo dpkg -i nrf-command-line-tools_10.24.2_amd64.deb + wget -q -P ~ https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/desktop-software/nrf-command-line-tools/sw/versions-10-x-x/10-24-2/nrf-command-line-tools_10.24.2_amd64.deb + sudo dpkg -i ~/nrf-command-line-tools_10.24.2_amd64.deb + rm -f ~/nrf-command-line-tools_10.24.2_amd64.deb - name: Install Arm GNU Toolchain (arm-none-eabi-gcc) uses: carlosperate/arm-none-eabi-gcc-action@v1 @@ -56,8 +57,9 @@ jobs: - name: Download and install Nordic SDK nRF5_SDK_15.3.0_59ac345 if: steps.cache-nRF5_SDK.outputs.cache-hit != 'true' run: | - wget -q https://developer.nordicsemi.com/nRF5_SDK/nRF5_SDK_v15.x.x/nRF5_SDK_15.3.0_59ac345.zip - unzip -q nRF5_SDK_15.3.0_59ac345.zip -d ~ + wget -q -P ~ https://developer.nordicsemi.com/nRF5_SDK/nRF5_SDK_v15.x.x/nRF5_SDK_15.3.0_59ac345.zip + unzip -q ~/nRF5_SDK_15.3.0_59ac345.zip -d ~ + rm -f ~/nRF5_SDK_15.3.0_59ac345.zip - name: Get short commit hash if no tags id: get-version diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index ad559fe..819c0ff 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -30,8 +30,9 @@ jobs: - name: Install nRF Command Line Tools run: | - wget -q https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/desktop-software/nrf-command-line-tools/sw/versions-10-x-x/10-24-2/nrf-command-line-tools_10.24.2_amd64.deb - sudo dpkg -i nrf-command-line-tools_10.24.2_amd64.deb + wget -q -P ~ https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/desktop-software/nrf-command-line-tools/sw/versions-10-x-x/10-24-2/nrf-command-line-tools_10.24.2_amd64.deb + sudo dpkg -i ~/nrf-command-line-tools_10.24.2_amd64.deb + rm -f ~/nrf-command-line-tools_10.24.2_amd64.deb - name: Install Arm GNU Toolchain (arm-none-eabi-gcc) uses: carlosperate/arm-none-eabi-gcc-action@v1 @@ -53,8 +54,9 @@ jobs: - name: Download and install Nordic SDK nRF5_SDK_15.3.0_59ac345 if: steps.cache-nRF5_SDK.outputs.cache-hit != 'true' run: | - wget -q https://developer.nordicsemi.com/nRF5_SDK/nRF5_SDK_v15.x.x/nRF5_SDK_15.3.0_59ac345.zip - unzip -q nRF5_SDK_15.3.0_59ac345.zip -d ~ + wget -q -P ~ https://developer.nordicsemi.com/nRF5_SDK/nRF5_SDK_v15.x.x/nRF5_SDK_15.3.0_59ac345.zip + unzip -q ~/nRF5_SDK_15.3.0_59ac345.zip -d ~ + rm -f ~/nRF5_SDK_15.3.0_59ac345.zip - name: Get Version from Tag id: get-version