Skip to content

Merge upstream changes#2

Merged
philnielsen-mercury merged 24 commits into
mainfrom
merge-upstream-changes
Jan 14, 2026
Merged

Merge upstream changes#2
philnielsen-mercury merged 24 commits into
mainfrom
merge-upstream-changes

Conversation

@philnielsen-mercury
Copy link
Copy Markdown

@philnielsen-mercury philnielsen-mercury commented Jan 14, 2026

we noticed node 24 is much faster, so lets get all upstream

jww3 and others added 23 commits October 18, 2024 10:07
…ons#1941)

* `utl-helper.ts` now leverages well-known environment variables.

---------
Co-authored-by: Erez Testiler <[email protected]>
* Prepare 4.2.2 Release

---------

Co-authored-by: Josh Gross <[email protected]>
Add a scenario where it is necessary to push a commit to a pull request.
…#2043)

* Update README.md

* Update README.md

Co-authored-by: Josh Gross <[email protected]>

---------

Co-authored-by: Josh Gross <[email protected]>
* package updates

* update dist

* Update license files
* use node 24

* update other parts to node 24

* bump to major version, audit fix, changelog

* update licenses

* update dist

* update major version

* will do separate pr for v5 and will do a minor version for previous changes
…ctions#2248)

* Update README to include Node.js 24 support details and requirements

* Update
- Updated README.md examples to reference @v6
- Updated all workflow files to use actions/checkout@v6
…is set (actions#2355)

* Initial plan

* Add orchestration ID support to git user-agent

Co-authored-by: TingluoHuang <[email protected]>

* Apply suggestion from @Copilot

Co-authored-by: Copilot <[email protected]>

* Improve tests to verify user-agent content and handle empty sanitized IDs

Co-authored-by: TingluoHuang <[email protected]>

* Simplify orchestration ID validation to accept any non-empty sanitized value

Co-authored-by: TingluoHuang <[email protected]>

* Remove test for orchestration ID with only invalid characters

Co-authored-by: TingluoHuang <[email protected]>

---------

Co-authored-by: copilot-swe-agent[bot] <[email protected]>
Co-authored-by: TingluoHuang <[email protected]>
Co-authored-by: Tingluo Huang <[email protected]>
Co-authored-by: Copilot <[email protected]>
…ns#2356)

This PR fixes several issues with tag handling in the checkout action:

1. fetch-tags: true now works (fixes actions#1471)
   - Tags refspec is now included in getRefSpec() when fetchTags=true
   - Previously tags were only fetched during a separate fetch that was
     overwritten by the main fetch

2. Tag checkout preserves annotations (fixes actions#290)
   - Tags are fetched via refspec (+refs/tags/*:refs/tags/*) instead of
     --tags flag
   - This fetches the actual tag objects, preserving annotations

3. Tag checkout with fetch-tags: true no longer fails (fixes actions#1467)
   - When checking out a tag with fetchTags=true, only the wildcard
     refspec is used (specific tag refspec is redundant)

Changes:
- src/ref-helper.ts: getRefSpec() now accepts fetchTags parameter and
  prepends tags refspec when true
- src/git-command-manager.ts: fetch() simplified to always use --no-tags,
  tags are fetched explicitly via refspec
- src/git-source-provider.ts: passes fetchTags to getRefSpec()
- Added E2E test for fetch-tags option

Related actions#1471, actions#1467, actions#290
Resolved conflicts:
- action.yml: Keep reference input, upgrade to node24
- dist/index.js: Keep referenceAdd method, adopt upstream tag fetching logic
@philnielsen-mercury philnielsen-mercury merged commit 2b6b716 into main Jan 14, 2026
13 of 20 checks passed
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.