Skip to content

Commit 949510f

Browse files
committed
Step activation step dir is always set now
1 parent 1668876 commit 949510f

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

cli/step_activator.go

+10-4
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ func (a stepActivator) activateStep(
6767
}
6868

6969
return stepmanModels.ActivatedStep{
70-
StepYMLPath: stepYMLPth,
70+
SourceAbsDirPath: stepDir,
71+
StepYMLPath: stepYMLPth,
7172
}, origStepYMLPth, nil
7273
} else if stepIDData.SteplibSource == "git" {
7374
log.Debugf("[BITRISE_CLI] - Remote step, with direct git uri: (uri:%s) (tag-or-branch:%s)", stepIDData.IDorURI, stepIDData.Version)
@@ -100,13 +101,12 @@ even if the repository is open source!`)
100101
}
101102

102103
return stepmanModels.ActivatedStep{
103-
StepYMLPath: stepYMLPth,
104+
SourceAbsDirPath: stepDir,
105+
StepYMLPath: stepYMLPth,
104106
}, "", nil
105107
} else if stepIDData.SteplibSource == "_" {
106108
log.Debugf("[BITRISE_CLI] - Steplib independent step, with direct git uri: (uri:%s) (tag-or-branch:%s)", stepIDData.IDorURI, stepIDData.Version)
107109

108-
// Steplib independent steps are completly defined in workflow
109-
stepYMLPth = ""
110110
if err := workflowStep.FillMissingDefaults(); err != nil {
111111
return stepmanModels.ActivatedStep{}, "", err
112112
}
@@ -118,6 +118,12 @@ even if the repository is open source!`)
118118
if err := repo.CloneTagOrBranch(stepIDData.IDorURI, stepIDData.Version).Run(); err != nil {
119119
return stepmanModels.ActivatedStep{}, "", err
120120
}
121+
122+
return stepmanModels.ActivatedStep{
123+
SourceAbsDirPath: stepDir,
124+
StepYMLPath: "", // Steplib independent steps are completly defined in workflow
125+
},
126+
"", nil
121127
} else if stepIDData.SteplibSource != "" {
122128
isUpdated := buildRunResults.IsStepLibUpdated(stepIDData.SteplibSource)
123129
stepInfo, activatedStep, didUpdate, err := activateStepLibStep(stepIDData, stepDir, stepYMLPth, isUpdated)

vendor/github.com/bitrise-io/stepman/cli/preload_steps.go

+4-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)