Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Avoid MacOS keychain dialog in integration tests #32813

Merged

Conversation

bohde
Copy link
Contributor

@bohde bohde commented Dec 12, 2024

Mac's git installation ships with a system wide config that configures the credential helper osxkeychain, which will prompt the user with a dialog.

$ git config list --system 
credential.helper=osxkeychain

By setting the environment variable GIT_CONFIG_NOSYSTEM=true, Git will not load the system wide config, preventing the dialog from populating.

Closes #26717

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Dec 12, 2024
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Dec 12, 2024
@bohde bohde changed the title avoid MacOS keychain dialog in integration tests Avoid MacOS keychain dialog in integration tests Dec 12, 2024
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Dec 12, 2024
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Dec 12, 2024
@lunny lunny added this to the 1.23.0 milestone Dec 12, 2024
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Dec 12, 2024
@techknowlogick techknowlogick added backport/v1.22 This PR should be backported to Gitea 1.22 and removed lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. labels Dec 12, 2024
@techknowlogick techknowlogick enabled auto-merge (squash) December 12, 2024 20:43
@techknowlogick techknowlogick added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Dec 12, 2024
@GiteaBot GiteaBot added the lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. label Dec 12, 2024
@techknowlogick techknowlogick merged commit a03fdd9 into go-gitea:main Dec 12, 2024
26 checks passed
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Dec 12, 2024
Mac's git installation ships with a system wide config that configures
the credential helper `osxkeychain`, which will prompt the user with a
dialog.

```
$ git config list --system 
credential.helper=osxkeychain
```
By setting the environment variable
[`GIT_CONFIG_NOSYSTEM=true`](https://git-scm.com/docs/git-config#ENVIRONMENT),
Git will not load the system wide config, preventing the dialog from
populating.

Closes go-gitea#26717
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Dec 12, 2024
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Dec 12, 2024
lunny pushed a commit that referenced this pull request Dec 12, 2024
Backport #32813 by @bohde

Mac's git installation ships with a system wide config that configures
the credential helper `osxkeychain`, which will prompt the user with a
dialog.

```
$ git config list --system 
credential.helper=osxkeychain
```
By setting the environment variable
[`GIT_CONFIG_NOSYSTEM=true`](https://git-scm.com/docs/git-config#ENVIRONMENT),
Git will not load the system wide config, preventing the dialog from
populating.

Closes #26717

Co-authored-by: Rowan Bohde <rowan.bohde@gmail.com>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Dec 13, 2024
* giteaofficial/main:
  Fix bug of branch/tag selector in the issue sidebar (go-gitea#32744)
  Fix lfs migration (go-gitea#32812)
  Avoid MacOS keychain dialog in integration tests (go-gitea#32813)
  Update actionlint.yaml
  Detect whether action view branch was deleted (go-gitea#32764)
  Add "n commits" link to contributors in contributors graph page (go-gitea#32799)
  Fix "unicode escape" JS error (go-gitea#32806)
  use dedicated runners for release artifacts (go-gitea#32811)
  Make API "compare" accept commit IDs (go-gitea#32801)
  Implement update branch API (go-gitea#32433)
  Fix JS error when dropping a file to a editor without dropzone (go-gitea#32804)
  chore: use errors.New to replace fmt.Errorf with no parameters (go-gitea#32800)
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
backport/done All backports for this PR have been created backport/v1.22 This PR should be backported to Gitea 1.22 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/go Pull requests that update Go code size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/testing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unit testing on macOS invokes keychain
4 participants