Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Issue-267 Add fingerprint header, to autodetect Bitbucket DC instances. #373

Merged

Conversation

mminns
Copy link
Contributor

@mminns mminns commented Jun 18, 2021

Addressed #267

Uses the Atlassian specific HTTP Header "X-AREQUESTID" to fingerprint a Bitbucket on-premise instance.

Added a simple test, I notice there are currently no tests for Bitbucket, so I might look at that more generally in a separate PR.

It's been a while since I contributed, nice to be back. :)

@mminns mminns force-pushed the issue-267-auto-detect-bitbucket-dc branch 2 times, most recently from 13f2b8c to d48fb28 Compare June 18, 2021 13:28
@mminns
Copy link
Contributor Author

mminns commented Jun 21, 2021

Seems to be a timeout issue on the macOS CI.

FWIW I'm seeing the same behaviour on my local mac for my branch and main, its sitting at this stage

  Building Installer.Mac...
  Copying uninstall script...
  Publishing core application...
  Microsoft (R) Build Engine version 16.10.0-preview-21181-07+073022eb4 for .NET
  Copyright (C) Microsoft Corporation. All rights reserved.

    Determining projects to restore...

To be fair I've not yet waited for 5 hours...

@mminns
Copy link
Contributor Author

mminns commented Jun 21, 2021

It seems to hang during this dotnet publish command in this stack of calls

  1. dotnet build --configuration MacRelease
  2. ./src/osx/Installer.Mac/build.sh --configuration='Release' --version='2.0.473.2013'
  3. ./src/osx/Installer.Mac/layout.sh --configuration=Release --output=/.../out/osx/Installer.Mac/pkg/Release/payload
  4. dotnet publish /.../src/shared/Git-Credential-Manager --configuration=Release --framework=net5.0 --runtime=osx-x64 --output=/.../out/osx/Installer.Mac/pkg/Release/payload

However manually run any of the steps 2, 3, 4 and they run to completion.

But dotnet build --configuration MacRelease continues to hang.

@mjcheetham
Copy link
Collaborator

@mminns what version of macOS and dotnet do you have installed? (dotnet --version and dotnet --list-sdks)

I've tried reproing this issue locally (macOS 11.4, dotnet 5.0.202, SDKs: [ 3.1.407, 3.1.408, 5.0.201, 5.0.202 ]) but it doesn't hang.

I have however seen this happen locally to me before, but re-running "fixed" the issue, and I've never been able to nail it down.

@mjcheetham
Copy link
Collaborator

mjcheetham commented Jun 22, 2021

I was going to try adding --no-restore to those dotnet publish command in layout.sh to see if that helps.
It might have something to do with this script is calling dotnet from inside a dotnet invoked MSBuild, and some deadlock on the restore sentinel files.

Copy link
Collaborator

@mjcheetham mjcheetham left a comment

Choose a reason for hiding this comment

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

It's been a while since I contributed, nice to be back. :)

Welcome back, and thanks for the contribution (especially the thorough write-up doc on BB auth)! 😄 ❤️

@mjcheetham
Copy link
Collaborator

Hey @mminns can you rebase your changes on the latest microsoft/main that includes some fixes to the macOS CI?

Copied and refreshed the Bitbucket development doc from the Git Credential Manager for Windows project.
@mminns mminns force-pushed the issue-267-auto-detect-bitbucket-dc branch from d48fb28 to 702ddb3 Compare June 22, 2021 21:42
@mminns
Copy link
Contributor Author

mminns commented Jun 22, 2021

Hi @mjcheetham thanks for the feedback.

I've rebased and pushed so 🤞 .

FWIW I did try --no-restore without luck last week.

I'm running:

$ dotnet --version
5.0.301
$ dotnet --list-sdks
2.2.207 [/usr/local/share/dotnet/sdk]
3.1.101 [/usr/local/share/dotnet/sdk]
3.1.201 [/usr/local/share/dotnet/sdk]
3.1.301 [/usr/local/share/dotnet/sdk]
3.1.302 [/usr/local/share/dotnet/sdk]
3.1.401 [/usr/local/share/dotnet/sdk]
3.1.408 [/usr/local/share/dotnet/sdk]
5.0.102 [/usr/local/share/dotnet/sdk]
5.0.202 [/usr/local/share/dotnet/sdk]
5.0.301 [/usr/local/share/dotnet/sdk]
6.0.100-preview.3.21202.5 [/usr/local/share/dotnet/sdk]

On macOS Cataline 10.15.7

I haven't tried re-running locally after the rebase, I'll try that in the morning if the CI fails again.

@mminns
Copy link
Contributor Author

mminns commented Jun 22, 2021

Yay, it all passed in the time it too me the write the last message 👍

@mjcheetham mjcheetham merged commit 8b585a2 into git-ecosystem:main Jun 24, 2021
@mjcheetham mjcheetham mentioned this pull request Aug 11, 2021
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.

None yet

2 participants