Skip to content
Snippets Groups Projects

Native Step Runner Integration for Docker Executor

Merged Axel von Bertoldi requested to merge avonbertoldi/47414/steps-integration-docker into main
1 file
+ 13
0
Compare changes
  • Side-by-side
  • Inline
+ 13
0
@@ -12,6 +12,7 @@ import (
"github.com/sirupsen/logrus"
"gitlab.com/gitlab-org/gitlab-runner/helpers/featureflags"
url_helpers "gitlab.com/gitlab-org/gitlab-runner/helpers/url"
"gitlab.com/gitlab-org/gitlab-runner/helpers/vault/auth_methods"
)
@@ -626,7+627,7 @@
func (j *JobResponse) StepsShim() error {
switch {
case j.Run == "":
return nil
case slices.ContainsFunc(j.Steps, func(step Step) bool { return len(step.Script) > 0 }):
return fmt.Errorf("the `run` and `script` keywords cannot be used together")
@@ -652,7+653,7 @@
Name: StepNameScript,
Script: StepScript{"/step-runner ci"},
Timeout: 3600,
When: "on_success",
AllowFailure: false,
}}
return nil
}
func (j *JobResponse) NativeStepsRequested() bool {
if j.Run == "" {
return false
}
for _, v := range j.Variables {
if v.Key == featureflags.UseNativeSteps {
return true
}
}
return false
}
type Secrets map[string]Secret
type Secret struct {
Loading