Define correct workspace on the Action

futurice · Nov 9, 2023 · 1ba2a18 · 1ba2a18
1 parent 3d715f7
commit 1ba2a18
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/action.yml b/action.yml
@@ -1,7 +1,8 @@
 name: "Jalapeno"
-description: "Run Jalapeno check-updates on a project"
+description: "Run Jalapeno check on the workspace"
 runs:
   using: "docker"
   image: "docker://ghcr.io/futurice/jalapeno:v0-githubaction"
   args:
     - check
+    - --dir=/github/workspace
diff --git a/cmd/action/main.go b/cmd/action/main.go
@@ -27,7 +27,7 @@ func main() {
 	delimiter := uuid.Must(uuid.NewV4()).String()
 	fmt.Fprintf(output, "result<<%s\n", delimiter)
 
-	// TODO: Add result
+	// TODO: Add outputs
 
 	fmt.Fprintf(output, "%s\n", delimiter)
 

diff --git a/internal/cli/cmds_test.go b/internal/cli/cmds_test.go
@@ -146,21 +146,20 @@ func wrapCmdOutputs(ctx context.Context) (context.Context, *cobra.Command) {
 }
 
 func cleanTempDirs(ctx context.Context, sc *godog.Scenario, err error) (context.Context, error) {
-	if dir := ctx.Value(projectDirectoryPathCtxKey{}); dir != nil {
-		os.RemoveAll(dir.(string))
+	directoryCtxKeys := []interface{}{
+		projectDirectoryPathCtxKey{},
+		recipesDirectoryPathCtxKey{},
+		certDirectoryPathCtxKey{},
+		htpasswdDirectoryPathCtxKey{},
+		dockerConfigDirectoryPathCtxKey{},
 	}
-	if dir := ctx.Value(recipesDirectoryPathCtxKey{}); dir != nil {
-		os.RemoveAll(dir.(string))
-	}
-	if dir := ctx.Value(certDirectoryPathCtxKey{}); dir != nil {
-		os.RemoveAll(dir.(string))
-	}
-	if dir := ctx.Value(htpasswdDirectoryPathCtxKey{}); dir != nil {
-		os.RemoveAll(dir.(string))
-	}
-	if dir := ctx.Value(dockerConfigDirectoryPathCtxKey{}); dir != nil {
-		os.RemoveAll(dir.(string))
+
+	for _, key := range directoryCtxKeys {
+		if dir := ctx.Value(key); dir != nil {
+			os.RemoveAll(dir.(string))
+		}
 	}
+
 	return ctx, err
 }