diff --git a/.github/release-notes/combined-release-template.md b/.github/release-notes/combined-release-template.md index 9c124e6..99f0f44 100644 --- a/.github/release-notes/combined-release-template.md +++ b/.github/release-notes/combined-release-template.md @@ -1,5 +1,3 @@ -# {{RELEASE_VERSION}} - ## Bundled Image Releases {{BUNDLE_LINKS}} diff --git a/.github/scripts/generate-combined-release.py b/.github/scripts/generate-combined-release.py index b30340e..6dcd0c6 100644 --- a/.github/scripts/generate-combined-release.py +++ b/.github/scripts/generate-combined-release.py @@ -41,31 +41,17 @@ def release_channel_text(release): def build_bundle_links(releases): - artifact_filter = set(parse_csv_env(os.environ.get("ARTIFACT_NAMES", ""))) lines = [] for rel in releases: image = rel["image"] tag = rel["tag_name"] channel = rel["channel"] html_url = rel["html_url"] - lines.append(f"### {image}") - lines.append(f"- Release: [{tag}]({html_url}) ({channel})") - assets = rel.get("assets", []) - if artifact_filter: - assets = [asset for asset in assets if asset.get("name", "") in artifact_filter] - if assets: - lines.append("- Artifacts:") - for asset in assets: - name = asset.get("name", "asset") - download_url = asset.get("browser_download_url") or asset.get("url", "") - size_mb = asset.get("size", 0) / (1024 * 1024) - lines.append(f" - [{name}]({download_url}) ({size_mb:.1f} MB)") + if html_url: + lines.append(f"### [{image}]({html_url})") else: - if artifact_filter: - lines.append("- Artifacts: _none matched the artifact_names filter_") - else: - lines.append("- Artifacts: _none found_") - lines.append("") + lines.append(f"### {image}") + lines.append(f"- [{image}]({html_url})") return "\n".join(lines).strip() diff --git a/.github/workflows/combine-release.yml b/.github/workflows/combine-release.yml index 317142e..3decbe1 100644 --- a/.github/workflows/combine-release.yml +++ b/.github/workflows/combine-release.yml @@ -21,10 +21,6 @@ on: description: 'Comma-separated release tags to combine (e.g., core-image-minimal-v1.0.0,core-image-medtech-v1.0.0). If empty, defaults to core-image-minimal/core-image-medtech for release_version.' required: false default: '' - artifact_names: - description: 'Optional comma-separated artifact names to include in bundled links. If empty, include all assets.' - required: false - default: '' jobs: combine: @@ -44,7 +40,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} RELEASE_VERSION: ${{ github.event.inputs.release_version }} GROUPED_RELEASE_TAGS: ${{ github.event.inputs.grouped_release_tags }} - ARTIFACT_NAMES: ${{ github.event.inputs.artifact_names }} - name: Upload combined release notes uses: actions/upload-artifact@v4 @@ -56,7 +51,7 @@ jobs: uses: softprops/action-gh-release@v2 with: tag_name: ${{ github.event.inputs.release_version }} - name: Device OS ${{ github.event.inputs.release_version }} Multi-Image Release + name: ${{ github.event.inputs.release_version }} body_path: combined-release.md draft: false prerelease: ${{ github.event.inputs.release_type == 'prerelease' }}