Skip to content

Commit

Permalink
Remove local action cache if remote has changed (#2284)
Browse files Browse the repository at this point in the history
* fix: remove local cache if remote is changed

* test: TestCloneIfRequired
  • Loading branch information
wolfogre committed Apr 10, 2024
1 parent d2c3413 commit cdc22da
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 0 deletions.
9 changes: 9 additions & 0 deletions pkg/common/git/git.go
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,15 @@ type NewGitCloneExecutorInput struct {

// CloneIfRequired ...
func CloneIfRequired(ctx context.Context, refName plumbing.ReferenceName, input NewGitCloneExecutorInput, logger log.FieldLogger) (*git.Repository, error) {
// If the remote URL has changed, remove the directory and clone again.
if r, err := git.PlainOpen(input.Dir); err == nil {
if remote, err := r.Remote("origin"); err == nil {
if len(remote.Config().URLs) > 0 && remote.Config().URLs[0] != input.URL {
_ = os.RemoveAll(input.Dir)
}
}
}

r, err := git.PlainOpen(input.Dir)
if err != nil {
var progressWriter io.Writer
Expand Down
30 changes: 30 additions & 0 deletions pkg/common/git/git_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import (
log "github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/nektos/act/pkg/common"
)

func TestFindGitSlug(t *testing.T) {
Expand Down Expand Up @@ -247,3 +249,31 @@ func gitCmd(args ...string) error {
}
return nil
}

func TestCloneIfRequired(t *testing.T) {
tempDir := t.TempDir()
ctx := context.Background()

t.Run("clone", func(t *testing.T) {
repo, err := CloneIfRequired(ctx, "refs/heads/main", NewGitCloneExecutorInput{
URL: "https://github.com/actions/checkout",
Dir: tempDir,
}, common.Logger(ctx))
assert.NoError(t, err)
assert.NotNil(t, repo)
})

t.Run("clone different remote", func(t *testing.T) {
repo, err := CloneIfRequired(ctx, "refs/heads/main", NewGitCloneExecutorInput{
URL: "https://github.com/actions/setup-go",
Dir: tempDir,
}, common.Logger(ctx))
require.NoError(t, err)
require.NotNil(t, repo)

remote, err := repo.Remote("origin")
require.NoError(t, err)
require.Len(t, remote.Config().URLs, 1)
assert.Equal(t, "https://github.com/actions/setup-go", remote.Config().URLs[0])
})
}

0 comments on commit cdc22da

Please sign in to comment.