Skip to content

Merge upstream/main to main#6

Open
cbush wants to merge 26 commits into
mainfrom
update
Open

Merge upstream/main to main#6
cbush wants to merge 26 commits into
mainfrom
update

Conversation

@cbush
Copy link
Copy Markdown
Owner

@cbush cbush commented Nov 21, 2025

No description provided.

sorenlouv and others added 26 commits May 20, 2025 12:44
* Simplify package version retrieval

* Add test for binary file

* Add debug info

* Add access token

* Cleanup test

* Move to private suite
When the access token is missing SAML auth a null-pointer would occur.
* Upgrade to 9.x

* Fix lint issues

* Simplify config file

* Final fixes

* Add promise rule

* Add `eslint-plugin-import`

* Format prettier on save

* Fix import order
* Fix post-install script

* Add tests

* Remove log output
* feat: add support for git rerere during cherrypick conflicts

When git rerere is enabled and automatically resolves conflicts during
cherrypick, the process would previously hang because the tool didn't
recognize that conflicts were resolved. Now detects when rerere has
staged resolved files and continues the backport process smoothly.

- Add getStagedFiles() function to detect rerere-resolved conflicts
- Enhance cherrypick() to check for staged files when conflicts occur
- Add comprehensive test coverage for rerere scenarios
- Maintain backward compatibility when rerere is not used

* chore: improve rerere handling + add tests

- improve logic with more defensive checks against git config
- differentiate between rerere.enabled and rerere.autoUpdate
- add comprehensive test coverage

* Add test

---------

Co-authored-by: Søren Louv-Jansen <sorenlouv@gmail.com>
* Add regex support to `copySourcePRLabels`

* Refactor to combine `getConfiguredTargetPRLabels` and `getSourcePRLabelsToCopy`

* Add `--runInBand`
* Fix postinstall integration test for asdf-managed yarn

The postinstall integration test was failing with exit code 126 when
yarn is managed by asdf. This occurs because the test overrides the
HOME environment variable, which breaks the asdf shim's ability to
locate its configuration and execute.

The issue is specific to development environments using asdf to manage
tool versions. In these environments, 'yarn' is typically a shell shim
at ~/.asdf/shims/yarn that requires the original HOME to function.

Solution:
- Detect if yarn is managed by asdf using 'asdf which yarn'
- Use the actual yarn binary path instead of the shim
- Use 'shell: /bin/bash' to ensure proper HOME variable handling
- Falls back to 'yarn' from PATH if asdf is not available

This fix ensures the test works in both asdf and non-asdf environments.

* fix: suppress asdf command not found errors in integration tests

Refactor yarn command resolution into shared helper that uses 'asdf which yarn'
to get the actual binary path instead of the shim. This suppresses the
'/bin/sh: asdf: command not found' error when HOME is overridden in tests.

- Extract getYarnCommand() helper to shared integration-test-helpers.ts
- Use 'which asdf' + realpath to find actual asdf binary
- Use 'asdf which yarn' to resolve actual yarn binary path
- Apply helper to all yarn commands in both integration test files
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.

4 participants