From 75ffa205c4dc02b1b8a57d247694a357ea9e1495 Mon Sep 17 00:00:00 2001
From: Kris <krisgeus@gmail.com>
Date: Tue, 28 Mar 2023 14:24:03 +0200
Subject: [PATCH] Make sure working directory is respected when configured from
matrix (#1686)
* Make sure working directory is respected when configured from matrix
* Fix regression by setting Workingdirectory on stepRun instead of step or too early
---
pkg/runner/step_run.go | 24 ++++++++++++++----------
pkg/runner/testdata/workdir/push.yml | 10 ++++++++++
2 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/pkg/runner/step_run.go b/pkg/runner/step_run.go
index ca77d56..4d855fd 100644
--- a/pkg/runner/step_run.go
+++ b/pkg/runner/step_run.go
@@ -13,10 +13,11 @@ import (
)
type stepRun struct {
- Step *model.Step
- RunContext *RunContext
- cmd []string
- env map[string]string
+ Step *model.Step
+ RunContext *RunContext
+ cmd []string
+ env map[string]string
+ WorkingDirectory string
}
func (sr *stepRun) pre() common.Executor {
@@ -27,12 +28,11 @@ func (sr *stepRun) pre() common.Executor {
func (sr *stepRun) main() common.Executor {
sr.env = map[string]string{}
-
return runStepExecutor(sr, stepStageMain, common.NewPipelineExecutor(
sr.setupShellCommandExecutor(),
func(ctx context.Context) error {
sr.getRunContext().ApplyExtraPath(ctx, &sr.env)
- return sr.getRunContext().JobContainer.Exec(sr.cmd, sr.env, "", sr.Step.WorkingDirectory)(ctx)
+ return sr.getRunContext().JobContainer.Exec(sr.cmd, sr.env, "", sr.WorkingDirectory)(ctx)
},
))
}
@@ -167,16 +167,20 @@ func (sr *stepRun) setupShell(ctx context.Context) {
func (sr *stepRun) setupWorkingDirectory(ctx context.Context) {
rc := sr.RunContext
step := sr.Step
+ workingdirectory := ""
if step.WorkingDirectory == "" {
- step.WorkingDirectory = rc.Run.Job().Defaults.Run.WorkingDirectory
+ workingdirectory = rc.Run.Job().Defaults.Run.WorkingDirectory
+ } else {
+ workingdirectory = step.WorkingDirectory
}
// jobs can receive context values, so we interpolate
- step.WorkingDirectory = rc.NewExpressionEvaluator(ctx).Interpolate(ctx, step.WorkingDirectory)
+ workingdirectory = rc.NewExpressionEvaluator(ctx).Interpolate(ctx, workingdirectory)
// but top level keys in workflow file like `defaults` or `env` can't
- if step.WorkingDirectory == "" {
- step.WorkingDirectory = rc.Run.Workflow.Defaults.Run.WorkingDirectory
+ if workingdirectory == "" {
+ workingdirectory = rc.Run.Workflow.Defaults.Run.WorkingDirectory
}
+ sr.WorkingDirectory = workingdirectory
}
diff --git a/pkg/runner/testdata/workdir/push.yml b/pkg/runner/testdata/workdir/push.yml
index c287d55..b76a951 100644
--- a/pkg/runner/testdata/workdir/push.yml
+++ b/pkg/runner/testdata/workdir/push.yml
@@ -22,3 +22,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- run: '[[ "$(pwd)" == "/tmp" ]]'
+
+ workdir-from-matrix:
+ runs-on: ubuntu-latest
+ strategy:
+ max-parallel: 1
+ matrix:
+ work_dir: ["/tmp", "/root"]
+ steps:
+ - run: '[[ "$(pwd)" == "${{ matrix.work_dir }}" ]]'
+ working-directory: ${{ matrix.work_dir }}