move if statement

nektos · May 21, 2023 · 921167b · 921167b
1 parent 7d005c1
commit 921167b
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/pkg/runner/run_context.go b/pkg/runner/run_context.go
@@ -535,17 +535,17 @@ func (rc *RunContext) isEnabled(ctx context.Context) (bool, error) {
 		return false, fmt.Errorf("  \u274C  Error in if-expression: \"if: %s\" (%s)", job.If.Value, runJobErr)
 	}
 
-	if !runJob {
-		l.WithField("jobResult", "skipped").Debugf("Skipping job '%s' due to '%s'", job.Name, job.If.Value)
-		return false, nil
-	}
-
 	if jobType == model.JobTypeInvalid {
 		return false, jobTypeErr
 	} else if jobType != model.JobTypeDefault {
 		return true, nil
 	}
 
+	if !runJob {
+		l.WithField("jobResult", "skipped").Debugf("Skipping job '%s' due to '%s'", job.Name, job.If.Value)
+		return false, nil
+	}
+
 	img := rc.platformImage(ctx)
 	if img == "" {
 		if job.RunsOn() == nil {