From f09cdb844367189aafe2f3af5795d3136db6b290 Mon Sep 17 00:00:00 2001
From: Robert Kowalski <robert.kowalski@new-work.se>
Date: Mon, 21 Mar 2022 12:23:06 +0100
Subject: [PATCH] feat: add flag to always run the checkout action (#1049)

act has a feature that skips the checkout action to do a remote
checkout when a local checkout exists. in some cases, e.g. when
running act in a CI, you always want to clone the repository.
---
 cmd/input.go               | 1 +
 cmd/root.go                | 2 ++
 pkg/runner/run_context.go  | 4 ++++
 pkg/runner/runner.go       | 1 +
 pkg/runner/step_context.go | 2 +-
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/cmd/input.go b/cmd/input.go
index e7f48df..ed6e36b 100644
--- a/cmd/input.go
+++ b/cmd/input.go
@@ -39,6 +39,7 @@ type Input struct {
 	artifactServerPath    string
 	artifactServerPort    string
 	jsonLogger            bool
+	noSkipCheckout        bool
 }
 
 func (i *Input) resolve(path string) string {
diff --git a/cmd/root.go b/cmd/root.go
index 1e96166..ac57595 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -71,6 +71,7 @@ func Execute(ctx context.Context, version string) {
 	rootCmd.PersistentFlags().StringVarP(&input.githubInstance, "github-instance", "", "github.com", "GitHub instance to use. Don't use this if you are not using GitHub Enterprise Server.")
 	rootCmd.PersistentFlags().StringVarP(&input.artifactServerPath, "artifact-server-path", "", "", "Defines the path where the artifact server stores uploads and retrieves downloads from. If not specified the artifact server will not start.")
 	rootCmd.PersistentFlags().StringVarP(&input.artifactServerPort, "artifact-server-port", "", "34567", "Defines the port where the artifact server listens (will only bind to localhost).")
+	rootCmd.PersistentFlags().BoolVarP(&input.noSkipCheckout, "no-skip-checkout", "", false, "Do not skip actions/checkout")
 	rootCmd.SetArgs(args())
 
 	if err := rootCmd.Execute(); err != nil {
@@ -287,6 +288,7 @@ func newRunCommand(ctx context.Context, input *Input) func(*cobra.Command, []str
 			AutoRemove:            input.autoRemove,
 			ArtifactServerPath:    input.artifactServerPath,
 			ArtifactServerPort:    input.artifactServerPort,
+			NoSkipCheckout:        input.noSkipCheckout,
 		}
 		r, err := runner.New(config)
 		if err != nil {
diff --git a/pkg/runner/run_context.go b/pkg/runner/run_context.go
index 620410d..9bb94a5 100644
--- a/pkg/runner/run_context.go
+++ b/pkg/runner/run_context.go
@@ -708,6 +708,10 @@ func setActionRuntimeVars(rc *RunContext, env map[string]string) {
 }
 
 func (rc *RunContext) localCheckoutPath() (string, bool) {
+	if rc.Config.NoSkipCheckout {
+		return "", false
+	}
+
 	ghContext := rc.getGithubContext()
 	for _, step := range rc.Run.Job().Steps {
 		if isLocalCheckout(ghContext, step) {
diff --git a/pkg/runner/runner.go b/pkg/runner/runner.go
index d80e0d3..5c9174c 100644
--- a/pkg/runner/runner.go
+++ b/pkg/runner/runner.go
@@ -48,6 +48,7 @@ type Config struct {
 	ArtifactServerPath    string                       // the path where the artifact server stores uploads
 	ArtifactServerPort    string                       // the port the artifact server binds to
 	CompositeRestrictions *model.CompositeRestrictions // describes which features are available in composite actions
+	NoSkipCheckout        bool                         // do not skip actions/checkout
 }
 
 // Resolves the equivalent host path inside the container
diff --git a/pkg/runner/step_context.go b/pkg/runner/step_context.go
index bdf3ead..9b7a1f8 100644
--- a/pkg/runner/step_context.go
+++ b/pkg/runner/step_context.go
@@ -92,7 +92,7 @@ func (sc *StepContext) Executor(ctx context.Context) common.Executor {
 		remoteAction.URL = rc.Config.GitHubInstance
 
 		github := rc.getGithubContext()
-		if remoteAction.IsCheckout() && isLocalCheckout(github, step) {
+		if remoteAction.IsCheckout() && isLocalCheckout(github, step) && !rc.Config.NoSkipCheckout {
 			return func(ctx context.Context) error {
 				common.Logger(ctx).Debugf("Skipping local actions/checkout because workdir was already copied")
 				return nil