Skip to content

Conversation

@babakks
Copy link
Member

@babakks babakks commented Jan 6, 2026

Fixes #12263

With this PR we tag the HEAD commit (per build job) to make sure the right version is baked into the built binaries.

We need to tag the HEAD commit to make sure the right version is baked
into the built binaries.

See for more details:
- #12263

Signed-off-by: Babak K. Shandiz <babakks@github.com>
Signed-off-by: Babak K. Shandiz <babakks@github.com>
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR addresses a false positive CVE detection issue (CVE-2024-52308) in Trivy scans by ensuring the correct version information is embedded in built binaries. The problem occurred because binaries were showing pseudo-versions like v2.0.0-20251104174640-152d328db80d instead of proper release tags, causing Trivy to incorrectly flag them as vulnerable versions.

  • Adds local git tag creation before each build job to embed proper version information in binaries
  • Applies the fix consistently across all three build platforms (Linux, macOS, Windows)
  • The tags are created locally only and not pushed to the remote repository

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Signed-off-by: Babak K. Shandiz <babakks@github.com>
Copy link
Member

@BagToad BagToad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, reviewed in sync

@babakks babakks enabled auto-merge January 6, 2026 17:08
@babakks babakks merged commit 4da13f8 into trunk Jan 6, 2026
9 checks passed
@babakks babakks deleted the bk-kw/tag-per-build branch January 6, 2026 17:15
tmeijn pushed a commit to tmeijn/dotfiles that referenced this pull request Jan 17, 2026
This MR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [cli/cli](https://github.com/cli/cli) | minor | `v2.83.2` → `v2.85.0` |

MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot).

**Proposed changes to behavior should be submitted there as MRs.**

---

### Release Notes

<details>
<summary>cli/cli (cli/cli)</summary>

### [`v2.85.0`](https://github.com/cli/cli/releases/tag/v2.85.0): GitHub CLI 2.85.0

[Compare Source](cli/cli@v2.83.2...v2.85.0)

#### What's Changed

##### ✨ Features

- Add gh browse --actions flag by [@&#8203;rneatherway](https://github.com/rneatherway) in [#&#8203;12091](cli/cli#12091)
- feat: allow git remote names in gh repo set-default by [@&#8203;majiayu000](https://github.com/majiayu000) in [#&#8203;12377](cli/cli#12377)

##### 🐛 Fixes

- Fix Debian CLI package link in installation guide by [@&#8203;andyfeller](https://github.com/andyfeller) in [#&#8203;12291](cli/cli#12291)
- fix: prevent panic when processing null project items by [@&#8203;chrishenzie](https://github.com/chrishenzie) in [#&#8203;12324](cli/cli#12324)

##### 📚 Docs & Chores

- chore: upgrade to `cli/oauth@v1.2.1`  by [@&#8203;babakks](https://github.com/babakks) in [#&#8203;12337](cli/cli#12337)
- ci: upgrade to GoReleaser `v2` by [@&#8203;babakks](https://github.com/babakks) in [#&#8203;12318](cli/cli#12318)
- CI: Update Azure Code Signing client to 1.0.95 by [@&#8203;BagToad](https://github.com/BagToad) in [#&#8203;12424](cli/cli#12424)
- CI: Update Azure Code Signing endpoint URL by [@&#8203;BagToad](https://github.com/BagToad) in [#&#8203;12425](cli/cli#12425)
- ci: tag per build job by [@&#8203;babakks](https://github.com/babakks) in [#&#8203;12428](cli/cli#12428)
- CI: Add shell specification for temporary tag creation on Windows by [@&#8203;BagToad](https://github.com/BagToad) in [#&#8203;12429](cli/cli#12429)
- Bump sigstore-go to v1.1.4 by [@&#8203;williammartin](https://github.com/williammartin) in [#&#8203;12289](cli/cli#12289)
- Update actions/checkout to v6 in extension workflow templates by [@&#8203;fchimpan](https://github.com/fchimpan) in [#&#8203;12393](cli/cli#12393)
- ci: enable noop linters by [@&#8203;babakks](https://github.com/babakks) in [#&#8203;12440](cli/cli#12440)

##### :dependabot: Dependencies

- chore(deps): bump golang.org/x/sync from 0.18.0 to 0.19.0 by [@&#8203;dependabot](https://github.com/dependabot)\[bot] in [#&#8203;12274](cli/cli#12274)
- chore(deps): bump golang.org/x/text from 0.31.0 to 0.32.0 by [@&#8203;dependabot](https://github.com/dependabot)\[bot] in [#&#8203;12281](cli/cli#12281)
- chore(deps): bump golang.org/x/term from 0.37.0 to 0.38.0 by [@&#8203;dependabot](https://github.com/dependabot)\[bot] in [#&#8203;12282](cli/cli#12282)
- chore(deps): bump github.com/spf13/cobra from 1.10.1 to 1.10.2 by [@&#8203;dependabot](https://github.com/dependabot)\[bot] in [#&#8203;12255](cli/cli#12255)
- chore(deps): bump github.com/gdamore/tcell/v2 from 2.13.1 to 2.13.2 by [@&#8203;dependabot](https://github.com/dependabot)\[bot] in [#&#8203;12262](cli/cli#12262)
- chore(deps): bump golangci/golangci-lint-action from 9.1.0 to 9.2.0 by [@&#8203;dependabot](https://github.com/dependabot)\[bot] in [#&#8203;12252](cli/cli#12252)
- chore(deps): bump github.com/gdamore/tcell/v2 from 2.13.2 to 2.13.4 by [@&#8203;dependabot](https://github.com/dependabot)\[bot] in [#&#8203;12302](cli/cli#12302)
- chore(deps): bump golang.org/x/crypto from 0.45.0 to 0.46.0 by [@&#8203;dependabot](https://github.com/dependabot)\[bot] in [#&#8203;12300](cli/cli#12300)
- chore(deps): bump actions/attest-build-provenance from 3.0.0 to 3.1.0 by [@&#8203;dependabot](https://github.com/dependabot)\[bot] in [#&#8203;12339](cli/cli#12339)
- chore(deps): bump github.com/yuin/goldmark from 1.7.13 to 1.7.16 by [@&#8203;dependabot](https://github.com/dependabot)\[bot] in [#&#8203;12452](cli/cli#12452)

#### New Contributors

- [@&#8203;chrishenzie](https://github.com/chrishenzie) made their first contribution in [#&#8203;12324](cli/cli#12324)
- [@&#8203;fchimpan](https://github.com/fchimpan) made their first contribution in [#&#8203;12393](cli/cli#12393)
- [@&#8203;majiayu000](https://github.com/majiayu000) made their first contribution in [#&#8203;12377](cli/cli#12377)

**Full Changelog**: <cli/cli@v2.83.2...v2.85.0>

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this MR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box

---

This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi44MS4yIiwidXBkYXRlZEluVmVyIjoiNDIuODEuMiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiUmVub3ZhdGUgQm90IiwiYXV0b21hdGlvbjpib3QtYXV0aG9yZWQiLCJkZXBlbmRlbmN5LXR5cGU6Om1pbm9yIl19-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Trivy is reporting a CVE that looks like it may be a false positive: CVE-2024-52308.

3 participants