rez icon indicating copy to clipboard operation
rez copied to clipboard

add missing backslashes to gitbash shell executable path

Open amorphousWaste opened this issue 3 years ago • 16 comments

Fixes #1302

amorphousWaste avatar Apr 28 '22 19:04 amorphousWaste

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

sonarqubecloud[bot] avatar Apr 28 '22 19:04 sonarqubecloud[bot]

CLA Signed

The committers listed above are authorized under a signed CLA.

  • :white_check_mark: login: amorphousWaste (e66c033bf9e0321aec55d052e316733a383ca6d1, 8dd24f5437ed30e71dc6fbb2588ac2a1712f6f25, 8f37a0c94b385a892092fa744563d5c23ee13fd7, f7966921f54fb7bd0dab942a308f9f2f42ee5768, d2d32de1a6a5d63ea780b7552d3b8cfdaf5710c6, f68c7bbf01fb9723e2ebb14da37a013b58624618, 0e7f93ee57808c2cb7f7566c5b34c5e52875aa6e, 7b8f934e44b0d96f241f86fe850285b45d79ae2e)

@amorphousWaste Can you undo the version bump please? It's normally preferable to not update it and let the maintainers change the version instead. Thanks!

Also, since the repo was moved to the ASWF, you will need to sign the CLA, see https://github.com/AcademySoftwareFoundation/rez/pull/1303#issuecomment-1144156270.

Additionally, you also need to sign your commits, see https://github.com/AcademySoftwareFoundation/rez/pull/1303/checks?check_run_id=6715395153 for instructions on how to do that.

Let us know if you have any questions!

I reverted the version and I'm waiting on my boss to approve me for contributions to the repo. Once that is done, I'll follow the instructions to retroactively sign the commits.

amorphousWaste avatar Jun 02 '22 21:06 amorphousWaste

Please let us know if you run into any issues with that!

A

PS - we should also add to the contribution guidelines wrt not changing version number. However this is also a reason to start enforcing branch naming standards, so maintainers can tell if a given pr is supposed to be a patch or minor update.

On Fri, 3 June 2022, 07:05 amorphousWaste, @.***> wrote:

I reverted the version and I'm waiting on my boss to approve me for contributions to the repo. Once that is done, I'll follow the instructions to retroactively sign the commits.

— Reply to this email directly, view it on GitHub https://github.com/AcademySoftwareFoundation/rez/pull/1303#issuecomment-1145340619, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAMOUSW5KS3WXCBD3DPPWTTVNEOZJANCNFSM5UTOYXJQ . You are receiving this because your review was requested.Message ID: @.***>

nerdvegas avatar Jun 02 '22 21:06 nerdvegas

Should I change the branch name?

amorphousWaste avatar Jun 02 '22 21:06 amorphousWaste

No it's fine. We don't have any naming convention yet.

CLA Missing ID CLA Not Signed

  • :white_check_mark: login: nerdvegas / name: allan johns (373b3cac51c92da9d1cb09ef53476a62c5074148)
  • :white_check_mark: login: amorphousWaste (fe1217df64b7d9dffdf0c1b420f1ae9fd1bf457a, 79e93a7c10ed64bf2144c5892c9ba2c466399074, 68317817f87fca0e2c82c327f99b4708f14225bc, 03195f64bc788dd97fe20347c73f66826ce57dd5, 30c47b4d1a200b01f1eee2c4e08ff42896e691f5, 5f91afd4e8624dad2c1ed36391db6fbb55ba8215, 47f51177a6210693246366b2a475c54620d864f2, f981faa94fdd579ec68d9c7edf07c8685ec254a0, 13220ebab273a1e253a9a5510fe7f9769d4b8315, 25869bc5bdf7dcf4fb40319ed3c8c5876b97fbf7)
  • :x: The commit (bbbd546e5ae4255d598d75b172fe21b8336c90a4, 3f54c1ecb205b45b9dada8b166182eae027009bd). This user is missing the User's ID, preventing the EasyCLA check. Consult GitHub Help to resolve.For further assistance with EasyCLA, please submit a support request ticket.

I retroactively signed my commits following the instructions, but it looks like one got left out. I followed the instructions again and now it looks like it doesn't like an email address. Sorry, but can anyone help me with this?

amorphousWaste avatar Jun 06 '22 18:06 amorphousWaste

DCO says:

Commit sha: [0880ee4](https://github.com/AcademySoftwareFoundation/rez/pull/1303/commits/0880ee4d5c6b4e7ec515219eb35215d10db3e561), Author: github.com/nerdvegas, Committer: amorphousWaste; nerdvegas@a043125d43e01f8c1ae440f0086f712c86b67214 is not a valid email address.

I don't know how that commit made it into the PR, but I would simply remove that commit as these commits are normally created from scheduled jobs that are not supposed to run on PRs.

By removing that commit from your branch, I think it will solve your issues.

Ah crap I know what that is. The benchmark CI does this, it commits the latest benchmark results into the repo. It won't be doing DCO yet, and it probably wasn't configured with a valid email address.

I'll see how I'm going tonight, might be able to put in a fix for this. It should be reasonably simple though.

On Tue, Jun 7, 2022 at 7:43 AM Jean-Christophe Morin < @.***> wrote:

DCO says:

Commit sha: 0880ee4, Author: github.com/nerdvegas, Committer: amorphousWaste; @.*** is not a valid email address.

I don't know how that commit made it into the PR, but I would simply remove that commit as these commits are normally created from scheduled jobs that are not supposed to run on PRs.

By removing that commit from your branch, I think it will solve your issues.

— Reply to this email directly, view it on GitHub https://github.com/AcademySoftwareFoundation/rez/pull/1303#issuecomment-1147962415, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAMOUSXFLWERVU7VJHPTHEDVNZWILANCNFSM5UTOYXJQ . You are receiving this because your review was requested.Message ID: @.***>

nerdvegas avatar Jun 06 '22 21:06 nerdvegas

@nerdvegas Yep, that's what I understood. What's not clear is how the commit got into this PR.

Yeah same actually. OP did you perhaps remerge with master at some point after you did the retro signoff? A

On Tue, Jun 7, 2022 at 8:11 AM Jean-Christophe Morin < @.***> wrote:

@nerdvegas https://github.com/nerdvegas Yep, that's what I understood. What's not clear is how the commit got into this PR.

— Reply to this email directly, view it on GitHub https://github.com/AcademySoftwareFoundation/rez/pull/1303#issuecomment-1147984656, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAMOUSWOOJZSVZICYGLHA7DVNZZRPANCNFSM5UTOYXJQ . You are receiving this because you were mentioned.Message ID: @.***>

nerdvegas avatar Jun 06 '22 22:06 nerdvegas

I don't think so. There wouldn't have been a reason to.

amorphousWaste avatar Jun 06 '22 22:06 amorphousWaste

See comment on https://github.com/AcademySoftwareFoundation/rez/issues/1302

ps - @amorphousWaste were you able to sign onto EasyCLA? And any more word on what's going on wrt DCO? I'm going to merge https://github.com/AcademySoftwareFoundation/rez/pull/1319 soon, which hopefully will help at least (if it's the benchmark CI commit causing the problem that is).

nerdvegas avatar Jun 14 '22 05:06 nerdvegas

I was finally able to jump back on this. I removed the config option and addes additional functions into the shells for returning paths in different styles as needed.

amorphousWaste avatar Aug 19 '22 18:08 amorphousWaste

I'm not sure why there is still an EasyCLA block. Everything should be signed off. Would anyone be able to assist?

amorphousWaste avatar Aug 19 '22 19:08 amorphousWaste

See https://github.com/AcademySoftwareFoundation/rez/pull/1303#issuecomment-1147962415. You have commits that are not supposed to be there. You also need to fix the conflict.

Probably dumb question, how do I know what commits shouldn't be there?

amorphousWaste avatar Aug 19 '22 19:08 amorphousWaste

If you look at the commits tab, all the commits that are not authored by you shouldn't be there. I have no idea how they ended up there. But fortunately, there is multiple ways to fix that:

  • You can manually remove them from your branch if you do an interactive rebase and drop the commits you want to drop.
  • You can delete your local branch and create a new one with the same name, and cherry-pick the commits you want.
  • Close this PR, create a new branch and cherry-pick you commits, create a new PR.
  • Or any other ways that you can come up with (some people like to get creative in their usage of git)

Also, could you add a description to the pull request please? Your latest commits changed what you previously did and it's not super clear how it's all supposed to work and if it addresses my comment and Allan's comment.

In general, it's always good to put a nice descriptive description that explains the thought process and why the changes were made the way you made them.

I think I've hecked up this PR too much, so at the risk of only making things worse I'm going to close this and make a new one.

amorphousWaste avatar Aug 20 '22 06:08 amorphousWaste