Skip to content

Move cgmanifest.json - #138

Merged
Charlie Barto (barcharcraz) merged 1 commit into
microsoft:masterfrom
barcharcraz:move_cgmanifest
Sep 26, 2019
Merged

Move cgmanifest.json#138
Charlie Barto (barcharcraz) merged 1 commit into
microsoft:masterfrom
barcharcraz:move_cgmanifest

Conversation

@barcharcraz

@barcharcraz Charlie Barto (barcharcraz) commented Sep 26, 2019

Copy link
Copy Markdown
Contributor

Please note that acceptance of community PRs will be delayed while we are
bringing our test and CI systems online. For more information, see the
README.md.

Description

Move CGmanifest to a more appropriate location. Fixes #125.

mirror of internal PR https://devdiv.visualstudio.com/DevDiv/_git/msvc/pullrequest/204398?_a=overview

Checklist:

  • I understand README.md.
  • If this is a feature addition, that feature has been voted into the C++
    Working Draft.
  • Identifiers in any product code changes are properly _Ugly as per
    https://eel.is/c++draft/lex.name#3.1 .
  • Identifiers in test code changes are not _Ugly.
  • Test code includes the correct headers as per the Standard, not just
    what happens to compile.
  • The STL builds and test harnesses have passed (must be manually verified
    by an STL maintainer before CI is online, leave this unchecked for initial
    submission).
  • This change introduces no known ABI breaks (adding members, renaming
    members, adding virtual functions, changing whether a type is an aggregate or
    trivially copyable, etc.). If unsure, leave this box unchecked and ask a
    maintainer for help.

@StephanTLavavej Stephan T. Lavavej (StephanTLavavej) changed the title move cgmanifest.json Move cgmanifest.json Sep 26, 2019
Comment thread docs/cgmanifest.json
"component": {
"type": "git",
"git": {
"repositoryUrl": "https://github.com/microsoft/STL.git",

@CaseyCarter Casey Carter (CaseyCarter) Sep 26, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Oh no, the singularity! AHHHHhhhhhhhhh...... (No change requested.)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I capitalized your PR title, and edited the description to mention which GitHub issue this fixes. Looks good to me.

@CaseyCarter

Copy link
Copy Markdown
Contributor

I capitalized your PR title, and edited the description to mention which GitHub issue this fixes. Looks good to me.

Be sure to edit these changes into the commit log, either when merging or now with a force-push*.

*Ideally, --force-with-lease, which is a bit safer if other folks may have pushed into the branch.

@StephanTLavavej

Copy link
Copy Markdown
Member

I am still unclear as to what happens when we press "Squash and merge". Does this ever use the original commit? This is related to whether commits appear as "Verified" or not, and why not all of them in the history are.

@BillyONeal

Copy link
Copy Markdown
Member

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@barcharcraz
Charlie Barto (barcharcraz) merged commit 0281a45 into microsoft:master Sep 26, 2019
@sylveon

Copy link
Copy Markdown
Contributor

Stephan T. Lavavej (@StephanTLavavej) Squash and merge combines all commits of the PR into one, and adds that commit to the target branch. The resulting squashed commit is shown as verified because it is signed with GitHub's GPG key. PRs which are merged using the rebase or merge commit strategy aren't signed by GitHub. Rebase merges can't be verified because they edit the commits to replay them on top of the target branch and therefore break the signature, but merge commit merges will show verified on the original commits if the author signed them with their GPG key because it does not edit the commits.

@BillyONeal

Copy link
Copy Markdown
Member

Charles Milette (@sylveon) It can't be just that because #114 was squashed but still doesn't show 'Verified'

@CaseyCarter

Copy link
Copy Markdown
Contributor

Charles Milette (@sylveon) It can't be just that because #114 was squashed but still doesn't show 'Verified'

#114 squashed unverified commits: https://github.com/microsoft/STL/pull/114/commits, so it wouldn't be signed.

@BillyONeal

Copy link
Copy Markdown
Member

#114 squashed unverified commits: https://github.com/microsoft/STL/pull/114/commits, so it wouldn't be signed.

#134 squashed unverified comments and shows up as "verified".

@sylveon

Copy link
Copy Markdown
Contributor

Then I'm not sure what's happening here.

@BillyONeal

Copy link
Copy Markdown
Member

That makes several of us :)

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.

cgmanifest.json: Move to a subdirectory

5 participants