fix: allow mapping into env variable INPUT_N from ${{ inputs.n }} (#1080)
When using a reusable workflow such as:
```yaml
name: "use-inputs-impl"
on:
workflow_call:
inputs:
image:
description: "Image to be used in job"
type: string
required: false
default: "docker.io/alpine:3.22"
condition:
description: "Only run a job if this is true"
type: string
required: false
default: false
jobs:
works:
runs-on: docker
container:
image: alpine:3.22
env:
INPUT_IMAGE: ${{ inputs.image }}
INPUT_CONDITION: ${{ inputs.condition }}
steps:
- run: echo "Hello world from Alpine"
- run: cat /etc/alpine-release
- run: echo "INPUT_IMAGE=$INPUT_IMAGE"
- run: echo "INPUT_CONDITION=$INPUT_CONDITION"
```
The runner will currently output un-evaluated expressions:
```
INPUT_IMAGE=${{ inputs.image }}
INPUT_CONDITION=${{ inputs.condition }}
```
Internally, the workflow is using `INPUT_...` environment variables to transfer data into local reusable workflows, and the order of evaluation in `getEvaluatorInputs` was preferring to use the un-evaluated value, over the evaluated value.
<!--start release-notes-assistant-->
<!--URL:https://code.forgejo.org/forgejo/runner-->
- bug fixes
- [PR](https://code.forgejo.org/forgejo/runner/pulls/1080): <!--number 1080 --><!--line 0 --><!--description Zml4OiBhbGxvdyBtYXBwaW5nIGludG8gZW52IHZhcmlhYmxlIElOUFVUX04gZnJvbSAke3sgaW5wdXRzLm4gfX0=-->fix: allow mapping into env variable INPUT_N from ${{ inputs.n }}<!--description-->
<!--end release-notes-assistant-->
Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/1080
Reviewed-by: earl-warren <earl-warren@noreply.code.forgejo.org>
Co-authored-by: Mathieu Fenniak <mathieu@fenniak.net>
Co-committed-by: Mathieu Fenniak <mathieu@fenniak.net>
This commit is contained in:
parent
66a7e82c43
commit
02247b852a
4 changed files with 32 additions and 2 deletions
|
|
@ -479,8 +479,6 @@ func rewriteSubExpression(ctx context.Context, in string, forceFormat bool) (str
|
|||
func getEvaluatorInputs(ctx context.Context, rc *RunContext, step step, ghc *model.GithubContext) map[string]any {
|
||||
inputs := map[string]any{}
|
||||
|
||||
setupWorkflowInputs(ctx, &inputs, rc)
|
||||
|
||||
var env map[string]string
|
||||
if step != nil {
|
||||
env = *step.getEnv()
|
||||
|
|
@ -494,6 +492,8 @@ func getEvaluatorInputs(ctx context.Context, rc *RunContext, step step, ghc *mod
|
|||
}
|
||||
}
|
||||
|
||||
setupWorkflowInputs(ctx, &inputs, rc)
|
||||
|
||||
if rc.caller == nil && ghc.EventName == "workflow_dispatch" {
|
||||
config := rc.Run.Workflow.WorkflowDispatchConfig()
|
||||
if config != nil && config.Inputs != nil {
|
||||
|
|
|
|||
|
|
@ -263,6 +263,7 @@ func TestRunner_RunEvent(t *testing.T) {
|
|||
{workdir, "uses-workflow", "pull_request", "", platforms, map[string]string{"secret": "keep_it_private"}},
|
||||
{workdir, "uses-docker-url", "push", "", platforms, secrets},
|
||||
{workdir, "act-composite-env-test", "push", "", platforms, secrets},
|
||||
{workdir, "uses-workflow-env-input", "push", "", platforms, secrets},
|
||||
|
||||
// Eval
|
||||
{workdir, "evalmatrix", "push", "", platforms, secrets},
|
||||
|
|
|
|||
21
act/runner/testdata/.github/workflows/local-reusable-env-input.yml
vendored
Normal file
21
act/runner/testdata/.github/workflows/local-reusable-env-input.yml
vendored
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
name: "use-inputs-impl"
|
||||
|
||||
on:
|
||||
workflow_call:
|
||||
inputs:
|
||||
greet_target:
|
||||
type: string
|
||||
required: false
|
||||
default: "Some Default Value"
|
||||
|
||||
jobs:
|
||||
works:
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
MY_INPUT_TEST: ${{ inputs.greet_target }}
|
||||
INPUT_TEST: ${{ inputs.greet_target }}
|
||||
INPUT_GREET_TARGET: ${{ inputs.greet_target }}
|
||||
steps:
|
||||
- run: '[ "$MY_INPUT_TEST" = "Mona the Octocat" ] || exit 1'
|
||||
- run: '[ "$INPUT_TEST" = "Mona the Octocat" ] || exit 1'
|
||||
- run: '[ "$INPUT_GREET_TARGET" = "Mona the Octocat" ] || exit 1'
|
||||
8
act/runner/testdata/uses-workflow-env-input/push.yml
vendored
Normal file
8
act/runner/testdata/uses-workflow-env-input/push.yml
vendored
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
name: local-action-env-input
|
||||
on: push
|
||||
jobs:
|
||||
test:
|
||||
runs-on: docker
|
||||
uses: ./testdata/.github/workflows/local-reusable-env-input.yml
|
||||
with:
|
||||
greet_target: 'Mona the Octocat'
|
||||
Loading…
Add table
Add a link
Reference in a new issue