From 568f0537239f4566ad2b05b8866611d5af612b94 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Mon, 27 Mar 2023 17:46:50 +0800 Subject: [PATCH] Revert "Erase needs of job in SingleWorkflow (#9)" (#32) This reverts commit 1ba076d32193a17319cd6426d18d00ec0607e3d9. `EraseNeeds` Shouldn't be used in `jobparser.Parse`, it's for https://github.com/go-gitea/gitea/blob/023e61e678dc353fa6c9b0299c37f48e98a3c7af/models/actions/run.go#L200 Or Gitea won't be able to get `Needs` of jobs. Reviewed-on: https://gitea.com/gitea/act/pulls/32 Reviewed-by: Zettat123 --- pkg/jobparser/jobparser.go | 1 - pkg/jobparser/testdata/has_needs.out.yaml | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/jobparser/jobparser.go b/pkg/jobparser/jobparser.go index 4165b46..33b900d 100644 --- a/pkg/jobparser/jobparser.go +++ b/pkg/jobparser/jobparser.go @@ -50,7 +50,6 @@ func Parse(content []byte, options ...ParseOption) ([]*SingleWorkflow, error) { runsOn[i] = evaluator.Interpolate(v) } job.RawRunsOn = encodeRunsOn(runsOn) - job.EraseNeeds() // there will be only one job in SingleWorkflow, it cannot have needs ret = append(ret, &SingleWorkflow{ Name: workflow.Name, RawOn: workflow.RawOn, diff --git a/pkg/jobparser/testdata/has_needs.out.yaml b/pkg/jobparser/testdata/has_needs.out.yaml index 959960d..a544aa2 100644 --- a/pkg/jobparser/testdata/has_needs.out.yaml +++ b/pkg/jobparser/testdata/has_needs.out.yaml @@ -10,6 +10,7 @@ name: test jobs: job2: name: job2 + needs: job1 runs-on: linux steps: - run: uname -a @@ -18,6 +19,7 @@ name: test jobs: job3: name: job3 + needs: [job1, job2] runs-on: linux steps: - run: uname -a