diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 927d797..53a3418 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -29,3 +29,5 @@ jobs: name: Build Upgrade Pack needs: Build uses: ./.github/workflows/wc-upgrade-pack.yml + with: + version: ${{ github.ref_name }} diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index ac229ed..b3a35bf 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -27,6 +27,8 @@ jobs: name: Build Upgrade Pack needs: [build] uses: ./.github/workflows/wc-upgrade-pack.yml + with: + version: ${{ github.ref_name }} apply-release-notes-template: name: 📝 Apply Release Template diff --git a/.github/workflows/wc-upgrade-pack.yml b/.github/workflows/wc-upgrade-pack.yml index d099c9b..6b3eefc 100644 --- a/.github/workflows/wc-upgrade-pack.yml +++ b/.github/workflows/wc-upgrade-pack.yml @@ -3,31 +3,38 @@ name: Continuous Integration on: workflow_call: + inputs: + version: + description: "Version" + required: true + type: string permissions: {} -env: - VERSION: "0.4.1" # x-release-please-version - jobs: upgrade-pack: name: Build Upgrade Pack runs-on: [ubuntu-latest] container: ghcr.io/philips-software/amp-devcontainer-cpp:v6.0.2@sha256:36afaaa5ba4bc4e9bb471012db9733c26a210e315ddb33600f73bb9532b02a25 # 6.0.2 + env: + VERSION: ${{ inputs.version }} steps: - uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0 with: name: HostInstall - - run: tar -zxvf Postmaster-${{ env.VERSION }}-Linux.tar.gz + - run: "tar -zxvf Postmaster-*-Linux.tar.gz" - run: mkdir install - - run: mv Postmaster-${{ env.VERSION }}-Linux/* install/ + - run: "mv Postmaster-*-Linux/* install/" - uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0 with: name: postmaster - - run: tar -zxvf Postmaster-${{ env.VERSION }}-Generic-ELF.tar.gz - - run: cp -r Postmaster-${{ env.VERSION }}-Generic-ELF/* install/ - - run: install/bin/postmaster.upgrade_pack_builder --app=install/bin/postmaster.postmaster_stm32f407.hex --output=Postmaster-${{ env.VERSION }}.upg + - run: "tar -zxvf Postmaster-*-Generic-ELF.tar.gz" + - run: "cp -r Postmaster-*-Generic-ELF/* install/" + - id: convert-version + run: 'echo "${VERSION}" | sed -e "s/v/version=/" -e "s/\(.*\)\/merge/version=\1/" >> "$GITHUB_OUTPUT"' + - run: 'echo "${VERSION}" | sed -e "s/v/version=/" -e "s/\(.*\)\/merge/version=\1/" >> "$GITHUB_ENV"' + - run: 'install/bin/postmaster.upgrade_pack_builder --app=install/bin/postmaster.postmaster_stm32f407.hex "--output=Postmaster-$version.upg"' - uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0 with: name: UpgradePack - path: Postmaster-${{ env.VERSION }}.upg + path: Postmaster-${{ steps.convert-version.outputs.version }}.upg diff --git a/release-please-config.json b/release-please-config.json index 9836a27..2dac498 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -5,7 +5,7 @@ ".": { "release-type": "simple", "package-name": "amp-postmaster", - "extra-files": ["CMakeLists.txt", ".github/workflows/wc-upgrade-pack.yml"] + "extra-files": ["CMakeLists.txt"] } }, "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json"