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.

thboop reviewed Apr 19, 2022

View changes

dist/index.js Outdated Show resolved Hide resolved

ericsciple approved these changes Apr 19, 2022

View changes

thboop approved these changes Apr 19, 2022

View changes

TingluoHuang mentioned this pull request Apr 20, 2022

safe.directory handling broken when using Cygwin Git #767

Open

TingluoHuang reviewed Apr 20, 2022

View 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 Apr 20, 2022

thboop reviewed Apr 20, 2022

View changes

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

.

e60026a

thboop approved these changes Apr 20, 2022

View 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 Apr 21, 2022

TingluoHuang added a commit that referenced this issue 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 issue 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 issue 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

Open

striezel mentioned this pull request Jun 14, 2022

update actions/checkout in GitHub Actions to v3 martinmoene/string-view-lite#51

Merged

striezel mentioned this pull request Jun 14, 2022

update actions/checkout in GitHub Actions to v3 martinmoene/span-lite#75

Merged

striezel mentioned this pull request Jun 14, 2022

update actions/checkout in GitHub Actions to v3 martinmoene/expected-lite#45

Merged

striezel mentioned this pull request Jun 14, 2022

update actions/checkout in GitHub Actions to v3 boostorg/intrusive#76

Merged

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

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

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

TingluoHuang commented Apr 20, 2022

me-and commented Apr 20, 2022

TingluoHuang commented Apr 19, 2022 •

edited