enable using worktrees #829

lvlrt · 2021-09-27T15:42:16Z

Enables using act in a worktree of Git (needs to follow the .git file directions)

codecov · 2021-09-27T15:59:53Z

Codecov Report

Merging #829 (4918f2f) into master (0f04942) will increase coverage by 9.75%.
The diff coverage is 66.24%.

@@            Coverage Diff             @@
##           master     #829      +/-   ##
==========================================
+ Coverage   49.27%   59.02%   +9.75%     
==========================================
  Files          23       25       +2     
  Lines        2401     4288    +1887     
==========================================
+ Hits         1183     2531    +1348     
- Misses       1090     1569     +479     
- Partials      128      188      +60

Impacted Files	Coverage Δ
pkg/container/docker_run.go	`7.08% <25.22%> (+5.15%)`	⬆️
pkg/common/git.go	`46.27% <25.45%> (-13.52%)`	⬇️
pkg/model/planner.go	`49.78% <42.50%> (+16.70%)`	⬆️
pkg/model/workflow.go	`52.14% <63.63%> (+26.42%)`	⬆️
pkg/container/docker_pull.go	`39.18% <65.51%> (+21.00%)`	⬆️
pkg/runner/runner.go	`76.72% <70.96%> (+0.25%)`	⬆️
pkg/runner/expression.go	`85.71% <72.09%> (-0.93%)`	⬇️
pkg/runner/step_context.go	`86.18% <89.47%> (+17.23%)`	⬆️
pkg/runner/run_context.go	`87.15% <92.72%> (+10.74%)`	⬆️
pkg/container/docker_build.go	`76.13% <100.00%> (+76.13%)`	⬆️
... and 27 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a0d3602...4918f2f. Read the comment docs.

mergify · 2021-09-27T18:18:03Z

@lvlrt this pull request has failed checks 🛠

catthehacker

+ // nolint:gocyclo
  func findGitDirectory(fromFile string) (string, error) {

catthehacker · 2021-09-27T22:20:53Z

Is it possible to have a git worktree on GitHub or some easy instructions to test the change? @lvlrt

catthehacker

Otherwise, it looks good to me but I never used git worktree nor know how they work

lvlrt · 2021-09-28T10:45:15Z

Is it possible to have a git worktree on GitHub or some easy instructions to test the change? @lvlrt

Absolutely,
A description how you'd typically use them is here: https://infrequently.org/2021/07/worktrees-step-by-step/

Tldr;

# create a directory for your worktree(s) to keep them clean & neat
mkdir act.git
cd act.git

# clone the bare repo for git operations & point to it
git clone --bare git@github.com:nektos/act.git .bare
echo "gitdir: ./.bare" > .git

# (start actual work) create a worktree
git worktree add master

# go in the worktree & test my change ;)
cd master
act # no errors should pop-up

Let me know if this clarifies the change

catthehacker · 2021-09-28T11:09:19Z

I'm asking this since it would be great if it's possible to add a testcase

github-actions · 2021-10-29T00:05:29Z

PR is stale and will be closed in 14 days unless there is new activity

catthehacker · 2021-11-13T15:42:31Z

this doesn't seem to work for me

  ~/go/src/github.com/nektos/act git-worktrees *25 !1 ?5 ❯ go run main.go -C pkg/runner/testdata/git-worktree/master/                                                                                                                                                                                                                                                                                                                                                          03:40:45 PM
WARN[0000] unable to get git revision: open /home/cat/go/src/github.com/nektos/act/pkg/runner/testdata/git-worktree/.bare/refs/heads/master: no such file or directory
WARN[0000] unable to get git ref: open /home/cat/go/src/github.com/nektos/act/pkg/runner/testdata/git-worktree/.bare/refs/heads/master: no such file or directory
[release/release] 🚀  Start image=catthehacker/ubuntu:act-latest
WARN[0000] unable to get git revision: open /home/cat/go/src/github.com/nektos/act/pkg/runner/testdata/git-worktree/.bare/refs/heads/master: no such file or directory
WARN[0000] unable to get git ref: open /home/cat/go/src/github.com/nektos/act/pkg/runner/testdata/git-worktree/.bare/refs/heads/master: no such file or directory
[release/release]   🐳  docker pull image=catthehacker/ubuntu:act-latest platform= username= forcePull=false
[release/release]   🐳  docker create image=catthehacker/ubuntu:act-latest platform= entrypoint=["/usr/bin/tail" "-f" "/dev/null"] cmd=[]
[release/release]   🐳  docker run image=catthehacker/ubuntu:act-latest platform= entrypoint=["/usr/bin/tail" "-f" "/dev/null"] cmd=[]
[release/release]   🐳  docker exec cmd=[mkdir -m 0777 -p /var/run/act] user=root workdir=
[release/release]   🐳  docker cp src=/home/cat/go/src/github.com/nektos/act/pkg/runner/testdata/git-worktree/master/. dst=/home/cat/go/src/github.com/nektos/act/pkg/runner/testdata/git-worktree/master
[release/release]   🐳  docker exec cmd=[mkdir -p /home/cat/go/src/github.com/nektos/act/pkg/runner/testdata/git-worktree/master] user= workdir=
WARN[0000] unable to get git revision: open /home/cat/go/src/github.com/nektos/act/pkg/runner/testdata/git-worktree/.bare/refs/heads/master: no such file or directory
WARN[0000] unable to get git ref: open /home/cat/go/src/github.com/nektos/act/pkg/runner/testdata/git-worktree/.bare/refs/heads/master: no such file or directory
WARN[0000] unable to get git revision: open /home/cat/go/src/github.com/nektos/act/pkg/runner/testdata/git-worktree/.bare/refs/heads/master: no such file or directory
WARN[0000] unable to get git ref: open /home/cat/go/src/github.com/nektos/act/pkg/runner/testdata/git-worktree/.bare/refs/heads/master: no such file or directory
WARN[0000] unable to get git revision: open /home/cat/go/src/github.com/nektos/act/pkg/runner/testdata/git-worktree/.bare/refs/heads/master: no such file or directory
WARN[0000] unable to get git ref: open /home/cat/go/src/github.com/nektos/act/pkg/runner/testdata/git-worktree/.bare/refs/heads/master: no such file or directory
[release/release] ⭐  Run actions/checkout@v2
WARN[0000] unable to get git revision: open /home/cat/go/src/github.com/nektos/act/pkg/runner/testdata/git-worktree/.bare/refs/heads/master: no such file or directory
WARN[0000] unable to get git ref: open /home/cat/go/src/github.com/nektos/act/pkg/runner/testdata/git-worktree/.bare/refs/heads/master: no such file or directory
WARN[0000] unable to get git revision: open /home/cat/go/src/github.com/nektos/act/pkg/runner/testdata/git-worktree/.bare/refs/heads/master: no such file or directory
WARN[0000] unable to get git ref: open /home/cat/go/src/github.com/nektos/act/pkg/runner/testdata/git-worktree/.bare/refs/heads/master: no such file or directory
WARN[0000] unable to get git revision: open /home/cat/go/src/github.com/nektos/act/pkg/runner/testdata/git-worktree/.bare/refs/heads/master: no such file or directory
WARN[0000] unable to get git ref: open /home/cat/go/src/github.com/nektos/act/pkg/runner/testdata/git-worktree/.bare/refs/heads/master: no such file or directory
[release/release]   ✅  Success - actions/checkout@v2
WARN[0000] unable to get git revision: open /home/cat/go/src/github.com/nektos/act/pkg/runner/testdata/git-worktree/.bare/refs/heads/master: no such file or directory
WARN[0000] unable to get git ref: open /home/cat/go/src/github.com/nektos/act/pkg/runner/testdata/git-worktree/.bare/refs/heads/master: no such file or directory
WARN[0000] unable to get git revision: open /home/cat/go/src/github.com/nektos/act/pkg/runner/testdata/git-worktree/.bare/refs/heads/master: no such file or directory
WARN[0000] unable to get git ref: open /home/cat/go/src/github.com/nektos/act/pkg/runner/testdata/git-worktree/.bare/refs/heads/master: no such file or directory
WARN[0000] unable to get git revision: open /home/cat/go/src/github.com/nektos/act/pkg/runner/testdata/git-worktree/.bare/refs/heads/master: no such file or directory
WARN[0000] unable to get git ref: open /home/cat/go/src/github.com/nektos/act/pkg/runner/testdata/git-worktree/.bare/refs/heads/master: no such file or directory
[release/release] ⭐  Run actions/setup-go@v2
WARN[0000] unable to get git revision: open /home/cat/go/src/github.com/nektos/act/pkg/runner/testdata/git-worktree/.bare/refs/heads/master: no such file or directory
WARN[0000] unable to get git ref: open /home/cat/go/src/github.com/nektos/act/pkg/runner/testdata/git-worktree/.bare/refs/heads/master: no such file or directory
INFO[0000]   ☁  git clone 'https://github.com/actions/setup-go' # ref=v2
[release/release]   🐳  docker cp src=/home/cat/.cache/act/actions-setup-go@v2/ dst=/var/run/act/actions/actions-setup-go@v2/
[release/release]   🐳  docker exec cmd=[mkdir -p /var/run/act/actions/actions-setup-go@v2/] user= workdir=
[release/release]   🐳  docker exec cmd=[node /var/run/act/actions/actions-setup-go@v2/dist/index.js] user= workdir=

KnisterPeter · 2021-11-24T17:03:39Z

@lvlrt This doesn't work as expected, since act is not working with bare repositories right now.

Act expects the .git folder to be a regular checkout. As you can see in this example, act is navigating from the .git folder.
Also other operations might need patches if the clone is a bare clone.

jasonk · 2021-12-01T22:04:37Z

Support for a bare clone should probably be something different from support for worktrees. You can use worktrees without a bare clone too.

❯ git clone https://github.com/nektos/act
Cloning into 'act'...
remote: Enumerating objects: 6186, done.
remote: Counting objects: 100% (1274/1274), done.
remote: Compressing objects: 100% (289/289), done.
remote: Total 6186 (delta 1132), reused 1003 (delta 981), pack-reused 4912
Receiving objects: 100% (6186/6186), 5.22 MiB | 5.78 MiB/s, done.
Resolving deltas: 100% (3169/3169), done.

❯ cd act

❯ git worktree add ../pr-829
Preparing worktree (new branch 'pr-829')
HEAD is now at b910a42 Docker auth (#891)

❯ cd ../pr-829

❯ cat .git
gitdir: /Users/jasonk/act/.git/worktrees/pr-829

KnisterPeter · 2021-12-01T22:15:42Z

But it will still not work with the current implementation, as act is working on the root working copy.
That need to be changed in this PR.

grigorye · 2022-05-19T08:54:46Z

Just in case, really looking for this to be implemented. If you need some help with worktrees/testing, please just let me know.

catthehacker · 2022-05-19T12:29:49Z

@grigorye as stated above, it doesn't currently work and original PR author is not responding.
Me and (probably rest of maintainers) don't have time nor see it as priority to work on this.
I also barely know worktrees and whole concept is rather confusing to me.
I'm going to close this unless original PR author responds. You can checkout their branch and improve upon it.

grigorye · 2022-05-19T15:27:21Z

@catthehacker Thanks for letting me know – I'll try to take a look. I have basically zero Go knowledge, though.

Btw, I can highly recommend taking a look at Git worktrees - if you like act, I guess you'll like worktrees as well: act makes GHA iteration cheaper/faster, worktrees make Git cloning/branching cheaper/faster/more effective as well. (And, just to mention it, it's now a standard Git feature, so it's supported by every valid Git client "out-of-box").

catthehacker · 2022-05-19T16:06:43Z

if you like act

to be completely honest, I don't use it 😳

Btw, I can highly recommend taking a look at Git worktrees

I'll figure it out someday when I'll have time 😉 and look at implementing it in act

grigorye · 2022-05-27T10:23:24Z

Just in case, at quick glance, this PR works fine in my case (I really appreciate it, @lvlrt). I don't use bare clones though, rather just add worktrees to a "normal clone". This is probably in sync with the note from @jasonk.

Ah, never mind - I used act -b, so it looks like that Git-related code path was not exercised at all... :-( Sorry for the confusion!

Will investigate it further.

grigorye · 2022-05-27T10:35:48Z

But it will still not work with the current implementation, as act is working on the root working copy.
That need to be changed in this PR.

@KnisterPeter Can you please explain/elaborate on this a bit? Git worktree does not change the root of working copy. It just changes the real location of .git data. And the latter seems to be reflected in this very PR?

lavigne958 · 2022-12-14T21:16:30Z

Hi everyone, I had a look at the PR, ran a couple of scenarios with bare clone -> worktree and regular clone -> worktree.
I noticed a difference between both for sure, but I have an idea on how to solve it.

Any new on how I can give it chance to solve it opening some PR and mention @lvlrt as contributor too (as I will use most of his code in my fix ) ? 🤔

I though I can cherry-pick his/her commits may be ?

Thank you.

enable using worktrees

d72ac48

lvlrt requested a review from a team as a code owner September 27, 2021 15:42

pull-request-size bot added the size/S label Sep 27, 2021

lvlrt mentioned this pull request Sep 27, 2021

Enhancement: working with git worktree #657

Closed

mergify bot added the needs-work Extra attention is needed label Sep 27, 2021

fix lint

97e5ef0

This comment has been minimized.

Sign in to view

nektos deleted a comment from mergify bot Sep 27, 2021

lvlrt and others added 2 commits September 27, 2021 20:07

fix lint

b20a7c0

Merge branch 'master' into git-worktrees

c5f57d9

catthehacker requested changes Sep 27, 2021

View reviewed changes

lvlrt and others added 2 commits September 27, 2021 22:17

added requested changes

f04926c

Merge branch 'master' into git-worktrees

4c7d8d6

lvlrt requested a review from catthehacker September 27, 2021 20:18

This comment has been minimized.

Sign in to view

mergify bot removed the needs-work Extra attention is needed label Sep 27, 2021

mergify bot requested a review from a team September 27, 2021 21:20

catthehacker approved these changes Sep 27, 2021

View reviewed changes

mergify bot requested a review from a team September 27, 2021 22:22

Merge branch 'master' into git-worktrees

4918f2f

github-actions bot added the stale label Oct 29, 2021

github-actions bot closed this Nov 12, 2021

catthehacker reopened this Nov 13, 2021

catthehacker added stale-exempt Exempt from stale and removed stale labels Nov 13, 2021

catthehacker mentioned this pull request May 11, 2022

Issue: .gitignore feature does not take index into account #1158

Closed

catthehacker removed the stale-exempt Exempt from stale label May 11, 2022

hakre mentioned this pull request May 11, 2022

Enhancement: core.excludesfile .gitignore (file) support #1160

Open

catthehacker closed this May 19, 2022

ZauberNerd mentioned this pull request Jul 5, 2022

unable to get git repo #1242

Closed

lavigne958 mentioned this pull request Dec 20, 2022

Feature/allow worktrees #1530

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

enable using worktrees #829

enable using worktrees #829

lvlrt commented Sep 27, 2021

codecov bot commented Sep 27, 2021 •

edited

This comment has been minimized.

mergify bot commented Sep 27, 2021

catthehacker left a comment

This comment has been minimized.

catthehacker commented Sep 27, 2021

catthehacker left a comment

lvlrt commented Sep 28, 2021 •

edited

catthehacker commented Sep 28, 2021

github-actions bot commented Oct 29, 2021

catthehacker commented Nov 13, 2021

KnisterPeter commented Nov 24, 2021

jasonk commented Dec 1, 2021

KnisterPeter commented Dec 1, 2021

grigorye commented May 19, 2022

catthehacker commented May 19, 2022

grigorye commented May 19, 2022 •

edited

catthehacker commented May 19, 2022

grigorye commented May 27, 2022 •

edited

grigorye commented May 27, 2022 •

edited

lavigne958 commented Dec 14, 2022

enable using worktrees #829

enable using worktrees #829

Conversation

lvlrt commented Sep 27, 2021

codecov bot commented Sep 27, 2021 • edited

Codecov Report

This comment has been minimized.

mergify bot commented Sep 27, 2021

catthehacker left a comment

Choose a reason for hiding this comment

This comment has been minimized.

catthehacker commented Sep 27, 2021

catthehacker left a comment

Choose a reason for hiding this comment

lvlrt commented Sep 28, 2021 • edited

catthehacker commented Sep 28, 2021

github-actions bot commented Oct 29, 2021

catthehacker commented Nov 13, 2021

KnisterPeter commented Nov 24, 2021

jasonk commented Dec 1, 2021

KnisterPeter commented Dec 1, 2021

grigorye commented May 19, 2022

catthehacker commented May 19, 2022

grigorye commented May 19, 2022 • edited

catthehacker commented May 19, 2022

grigorye commented May 27, 2022 • edited

grigorye commented May 27, 2022 • edited

lavigne958 commented Dec 14, 2022

codecov bot commented Sep 27, 2021 •

edited

lvlrt commented Sep 28, 2021 •

edited

grigorye commented May 19, 2022 •

edited

grigorye commented May 27, 2022 •

edited

grigorye commented May 27, 2022 •

edited