search

aormsby / Fork-Sync-With-Upstream-action

An action to automatically update your fork with new commits from the upstream repo
MIT License
258 stars 70 forks source link

Fix: Git config conflicts with other actions #35

Closed aormsby closed 3 years ago

aormsby commented 3 years ago

This probably should have been the functionality anyway, but the reason for this change is to avoid conflicts with git configurations set by other actions running in the same workflow.

For example, using another action like Import GPG to enable gpg signing would have failed before since the sync action overrode any git config values that Import GPG would have set. Now the sync sets config values a little more carefully - i.e. only when they're empty.

An example of using Import GPG on the sync wiki - https://github.com/aormsby/Fork-Sync-With-Upstream-action/wiki/GPG-Signing

This PR 's changes are currently testable by setting uses: aormsby/Fork-Sync-With-Upstream-action@feature/gpg in your workflow's sync step.

Fixes issue #33

mbwmbw1337 commented 3 years ago

Excellent I’ll try this shortly. Sorry I didn’t contribute it’s been crazy lately I’m so glad you made the time. Your program has been working flawlessly as part of our CI/CD platform.

mbwmbw1337 commented 3 years ago

I am testing now! On the wiki just a cosmetic change, you have two "# Step 2:" may want to increment the second to step 3 :). I will report back on the run is complete on how I made out.

mbwmbw1337 commented 3 years ago

Test passed. Wiki instructions are clear and followed. all working great. I am waiting for an upstream repo change but a dry run looks fine. I expect an upstream repo change today and will report back.

mbwmbw1337 commented 3 years ago

All tests have been completed successfully and no other impacts were noted. I'd suggest this be merged to master!

Thank you again for all your work on this and the detailed wiki.