Add set-safe-directory input to allow customer to take control. #770

TingluoHuang · 2022-04-19T03:57:40Z

In case of customers don't like the way we overwrite their global gitconfig with safe.directory.
Ex: customers have properly configured safe.directory on their environment, and actions/checkout overlay the wrong value.

dist/index.js

thboop

LGTM

This fix should allow setting safe.directory manually and not having it overridden by the actions/checkout action. Test the behaviour works as expected for both the Cygwin runner (with a manually set safe.directory in the Git config file) and the Ubuntu runner (with no explicit safe.directory wrangling). Disable build steps that are unnecessary / slow / would produce permanent changes. Enable steps that we want to check with this action even though they'd normally only be run for actual releases (subject to the previous caveat).

me-and · 2022-04-20T07:36:57Z

I've just kicked off a build at https://github.com/me-and/Cygwin-Git/actions/runs/2194248694, where I was hitting #767; the fix looks good, but the test should properly confirm that the fix resolves the problem I was seeing.

me-and · 2022-04-20T07:42:34Z

No, this doesn't work, at least as a fix for #767:

Run actions/checkout@users/tihuang/setsafedirinput
  with:
    set-safe-directory: false
    repository: me-and/Cygwin-Git
    token: ***
    ssh-strict: true
    persist-credentials: true
    clean: true
    fetch-depth: 1
    lfs: false
    submodules: false
  env:
    PATH: C:\cygwin\bin
Syncing repository: me-and/Cygwin-Git
Getting Git version info
  Working directory is 'D:\a\Cygwin-Git\Cygwin-Git'
  C:\cygwin\bin\git.exe version
  git version [2](https://github.com/me-and/Cygwin-Git/runs/6090840565?check_suite_focus=true#step:4:2).[3](https://github.com/me-and/Cygwin-Git/runs/6090840565?check_suite_focus=true#step:4:3)6.0
Temporarily overriding HOME='D:\a\_temp\22b865b8-[4](https://github.com/me-and/Cygwin-Git/runs/6090840565?check_suite_focus=true#step:4:4)a74-4ad8-8903-3b[5](https://github.com/me-and/Cygwin-Git/runs/6090840565?check_suite_focus=true#step:4:5)ceaecd8[7](https://github.com/me-and/Cygwin-Git/runs/6090840565?check_suite_focus=true#step:4:7)f' before making global git config changes
Adding working directory to the temporary git global config as a safe directory
Deleting the contents of 'D:\a\Cygwin-Git\Cygwin-Git'
Initializing the repository
  C:\cygwin\bin\git.exe init D:\a\Cygwin-Git\Cygwin-Git
  hint: Using 'master' as the name for the initial branch. This default branch name
  hint: is subject to change. To configure the initial branch name to use in all
  hint: of your new repositories, which will suppress this warning, call:
  hint: 
  hint: 	git config --global init.defaultBranch <name>
  hint: 
  hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
  hint: 'development'. The just-created branch can be renamed via this command:
  hint: 
  hint: 	git branch -m <name>
  Initialized empty Git repository in /cygdrive/d/a/Cygwin-Git/Cygwin-Git/.git/
  C:\cygwin\bin\git.exe remote add origin https://github.com/me-and/Cygwin-Git
  Error: fatal: unsafe repository ('/cygdrive/d/a/Cygwin-Git/Cygwin-Git' is owned by someone else)
  To add an exception for this directory, call:
  
  	git config --global --add safe.directory /cygdrive/d/a/Cygwin-Git/Cygwin-Git
  Error: The process 'C:\cygwin\bin\git.exe' failed with exit code 12[8](https://github.com/me-and/Cygwin-Git/runs/6090840565?check_suite_focus=true#step:4:8)

It looks like it's still copying the .gitconfig file from C:\Users\runneradmin\.gitconfig, which isn't the file that's managed by Cygwin's Git.

I don't think this change is a bad change, it just doesn't resolve my problem. I think resolving #767 needs to either entirely stop actions/checkout creating a temporary "global" .gitconfig file, or it needs to get the current config by running git commands rather than assuming the location of the config file.

TingluoHuang · 2022-04-20T18:54:40Z

.github/workflows/test.yml

+
+  test-git-container:
+    runs-on: ubuntu-latest
+    container: bitnami/git:latest


we will have e2e coverage on any newer git version release.

มันน่าจะดีมากขึ้นไปอีก ผมเคารพการตัดสินใจของชุมชน

thboop · 2022-04-20T20:02:47Z

.github/workflows/test.yml

+          git config --global --add safe.directory "*"
+          git fetch --no-tags --depth=1 origin +refs/heads/main:refs/remotes/origin/main
+
+      - name: Fix Checkout v3


Why are we running this again?

the second checkout will wipe the initial checkout and cause post-cleanup to fail...

maybe i can do clean:false, let me try...

it doesn't work... 😢

lets add a quick comment if we can just to say # needed to make post run succeed

จัดการได้ตามความเหมาะสม เห็นชอบ ของชุมชน

thboop

LGTM

TingluoHuang · 2022-04-20T20:56:49Z

@me-and I updated the branch to make sure when set-safe-directory: false we don't create the temp global gitconfig.
Do you mind give another try to test it out? 🙇

me-and · 2022-04-20T21:36:28Z

Yes, that seems to work! The full run hasn't completed yet, but it has got through the checkout stage using Cygwin Git.

Thank you!

* Add set-safe-directory input to allow customers to take control.

… (#776) * Add set-safe-directory input to allow customers to take control.

This has been resolved in the [checkout](actions/checkout#770) action and would already be set by default.

Bumps actions/checkout from 3 to 3.0.2. Release notes Sourced from actions/checkout's releases. v3.0.2 What's Changed Add set-safe-directory input to allow customers to take control. by @TingluoHuang in actions/checkout#770 Prepare changelog for v3.0.2. by @TingluoHuang in actions/checkout#777 Full Changelog: actions/checkout@v3...v3.0.2 v3.0.1 Fixed an issue where checkout failed to run in container jobs due to the new git setting safe.directory Bumped various npm package versions Changelog Sourced from actions/checkout's changelog. Changelog v3.0.2 Add input set-safe-directory v3.0.1 Fixed an issue where checkout failed to run in container jobs due to the new git setting safe.directory Bumped various npm package versions v3.0.0 Update to node 16 v2.3.1 Fix default branch resolution for .wiki and when using SSH v2.3.0 Fallback to the default branch v2.2.0 Fetch all history for all tags and branches when fetch-depth=0 v2.1.1 Changes to support GHES (here and here) v2.1.0 Group output Changes to support GHES alpha release Persist core.sshCommand for submodules Add support ssh Convert submodule SSH URL to HTTPS, when not using SSH Add submodule support Follow proxy settings Fix ref for pr closed event when a pr is merged Fix issue checking detached when git less than 2.22 v2.0.0 Do not pass cred on command line Add input persist-credentials Fallback to REST API to download repo v2 (beta) Improved fetch performance ... (truncated) Commits See full diff in compare view Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase. Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: @dependabot rebase will rebase this PR @dependabot recreate will recreate this PR, overwriting any edits that have been made to it @dependabot merge will merge this PR after your CI passes on it @dependabot squash and merge will squash and merge this PR after your CI passes on it @dependabot cancel merge will cancel a previously requested merge and block automerging @dependabot reopen will reopen this PR if it is closed @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Carlos Alexandro Becker <caarlos0@users.noreply.github.com>

This has been resolved in the [checkout](actions/checkout#770) action and would already be set by default. Update README.md Fix removed code lines * Add force with lease support * Update the documentation fix: github_token and github_url optional Add atomic push Since time elapses between the checkout the github workflow performs and the eventual push this action invokes the remote HEAD may have changed. If this is the case the HEAD update will be rejected but any tag (and their commits) will be pushed. In general I think this operation should be atomic, either we push everything or we push nothing. Force pushes still work the way you would expect (i.e. if we force the HEAD update with --atomic everything is still pushed) This also protects from the situation where someone else has seized your tag name in the meantime but not updated your HEAD. See git docs for more information - https://git-scm.com/docs/git-push#Documentation/git-push.txt---no-atomic Add option to control atomic switch Use node16 to run action Node.js 12 actions are deprecated. For more information see: https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/. Update the documentation and the push process feat: Restructure the code Update the documentation and the push process

alecasavdt · 2023-01-06T14:18:05Z

2

thboop reviewed Apr 19, 2022

View reviewed changes

dist/index.js Outdated Show resolved Hide resolved

ericsciple approved these changes Apr 19, 2022

View reviewed changes

thboop approved these changes Apr 19, 2022

View reviewed changes

TingluoHuang mentioned this pull request Apr 20, 2022

safe.directory handling broken when using Cygwin Git #767

Open

TingluoHuang commented Apr 20, 2022

View reviewed changes

Add set-safe-directory input to allow customer to take control.

49508e7

TingluoHuang force-pushed the users/tihuang/setsafedirinput branch from 2839779 to 49508e7 Compare April 20, 2022 19:59

thboop reviewed Apr 20, 2022

View reviewed changes

TingluoHuang force-pushed the users/tihuang/setsafedirinput branch from 718cc50 to 49508e7 Compare April 20, 2022 20:08

.

e60026a

thboop approved these changes Apr 20, 2022

View reviewed changes

.

a19dcb6

TingluoHuang mentioned this pull request Apr 20, 2022

v2 fail inside container - Error: ENOENT: no such file or directory, mkdir #771

Closed

TingluoHuang merged commit 0ffe6f9 into main Apr 21, 2022
11 checks passed

TingluoHuang deleted the users/tihuang/setsafedirinput branch April 21, 2022 01:37

TingluoHuang added a commit that referenced this pull request Apr 21, 2022

Add set-safe-directory input to allow customers to take control. (#770)

771ba60

* Add set-safe-directory input to allow customers to take control.

TingluoHuang added a commit that referenced this pull request Apr 21, 2022

Add set-safe-directory input to allow customers to take control. (#770)…

f67ee5d

… (#776) * Add set-safe-directory input to allow customers to take control.

poroping mentioned this pull request Apr 22, 2022

Bump actions/checkout from 3.0.0 to 3.0.2 poroping/terraform-provider-device42#22

Merged

hughsie mentioned this pull request Apr 22, 2022

Fix a CI failure for any distro using git >= 2.35.3 fwupd/fwupd#4545

Merged

4 tasks

buzztaiki mentioned this pull request Apr 24, 2022

CI failed by unsafe repository ruby/rbs#983

Closed

dreamorosi mentioned this pull request Apr 25, 2022

fix(actions): removed token from remaining actions awslabs/aws-lambda-powertools-typescript#805

Merged

3 tasks

striezel mentioned this pull request May 19, 2022

GHA: update actions/cache + actions/checkout to v3 boostorg/boost-ci#160

Merged

striezel mentioned this pull request Jun 4, 2022

update actions/cache + actions/checkout in GitHub Actions to v3 simdjson/simdjson#1839

Merged

jackton1 added a commit to jackton1/github-push-action that referenced this pull request Jun 14, 2022

chore: remove redundant safe-directory configuration

d403eb4

This has been resolved in the [checkout](actions/checkout#770) action and would already be set by default.

jackton1 mentioned this pull request Jun 14, 2022

chore: remove redundant safe.directory configuration ad-m/github-push-action#128

Merged

striezel mentioned this pull request Jul 2, 2022

update actions/checkout in GitHub Actions to v3 simdutf/simdutf#138

Merged

wrt54g mentioned this pull request Jul 4, 2022

Update actions/checkout to v3 truenas/os#252

Closed

pshriwise mentioned this pull request Jul 11, 2022

Adding safe folder to allow CI to compile DAGMC svalinn/DAGMC#816

Merged

This was referenced Aug 30, 2022

update actions/checkout in GitHub Actions to v3 asmaloney/libE57Format#103

Merged

update actions/checkout in GitHub Actions to v3 fastfloat/fast_float#141

Merged

0x2b3bfa0 mentioned this pull request Oct 12, 2022

dvc exp run: fails when used with github actions and CML docker container iterative/cml.dev#385

Open

nelsonni mentioned this pull request Oct 15, 2022

Bump checkout GitHub Action to v3 EPICLab/synectic#972

Closed

nelsonni mentioned this pull request Dec 7, 2022

Bump actions/checkout from v2 to v3 EPICLab/synectic#1030

Merged

lurch added a commit to lurch/checkout that referenced this pull request Dec 26, 2022

Fix comment typos (that got added in actions#770)

e96b7a8

vanZeben pushed a commit that referenced this pull request Dec 28, 2022

Fix comment typos (that got added in #770) (#1057)

ac59398

This was referenced Jan 17, 2023

[Bug] ValueError: SHA could not be resolved, git returned: b'' KSP-CKAN/xKAN-meta_testing#89

Closed

Update actions/checkout action to v3 KSP-CKAN/NetKAN#9527

Closed

jiridanek mentioned this pull request Jan 19, 2023

RPM build job fails in ci: ERROR: git_dir_version: Not a Git repository. skupperproject/skupper-router#908

Closed

Add set-safe-directory input to allow customer to take control. #770

Add set-safe-directory input to allow customer to take control. #770

TingluoHuang commented Apr 19, 2022 •

edited

thboop left a comment

me-and commented Apr 20, 2022

me-and commented Apr 20, 2022

TingluoHuang Apr 20, 2022

KritsanaVeingin May 6, 2022

thboop Apr 20, 2022

TingluoHuang Apr 20, 2022

TingluoHuang Apr 20, 2022

TingluoHuang Apr 20, 2022

thboop Apr 20, 2022

KritsanaVeingin May 6, 2022

thboop left a comment

TingluoHuang commented Apr 20, 2022

me-and commented Apr 20, 2022

alecasavdt commented Jan 6, 2023

Add set-safe-directory input to allow customer to take control. #770

Add set-safe-directory input to allow customer to take control. #770

Conversation

TingluoHuang commented Apr 19, 2022 • edited

thboop left a comment

Choose a reason for hiding this comment

me-and commented Apr 20, 2022

me-and commented Apr 20, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

thboop left a comment

Choose a reason for hiding this comment

TingluoHuang commented Apr 20, 2022

me-and commented Apr 20, 2022

alecasavdt commented Jan 6, 2023

TingluoHuang commented Apr 19, 2022 •

edited