Merge branch 'master' into secret-file-docs
This commit is contained in:
commit
52e4002c73
|
@ -296,6 +296,14 @@ func (sc *StepContext) vmEnv() func(*otto.Otto) {
|
|||
|
||||
func (sc *StepContext) vmInputs() func(*otto.Otto) {
|
||||
inputs := make(map[string]string)
|
||||
|
||||
// Set Defaults
|
||||
if sc.Action != nil {
|
||||
for k, input := range sc.Action.Inputs {
|
||||
inputs[k] = input.Default
|
||||
}
|
||||
}
|
||||
|
||||
for k, v := range sc.Step.With {
|
||||
inputs[k] = v
|
||||
}
|
||||
|
|
|
@ -5,6 +5,6 @@ jobs:
|
|||
test:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/hello-world-docker-action@master
|
||||
- uses: actions/hello-world-docker-action@main
|
||||
with:
|
||||
who-to-greet: 'Mona the Octocat'
|
||||
|
|
Loading…
Reference in New Issue