mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-05-12 22:10:25 +00:00
This change allows the `with:` field of a reusable workflow to reference a previous job, such as `with: { some-input: "${{ needs.other-job.outputs.other-output }}" }`. `strategy.matrix` can also reference `${{ needs... }}`.
When a job is parsed and encounters this situation, the outer job of the workflow is marked with a field `incomplete_with` (or `incomplete_matrix`), indicating to Forgejo that it can't be executed as-is and the other jobs in its `needs` list need to be completed first. And then in `job_emitter.go` when one job is completed, it checks if other jobs had a `needs` reference to it and unblocks those jobs -- but if they're marked with `incomplete_with` then they can be sent back through the job parser, with the now-available job outputs, to be expanded into the correct definition of the job.
The core functionality for this already exists to allow `runs-on` and `strategy.matrix` to reference the outputs of other jobs, but it is expanded upon here to include `with` for reusable workflows.
There is one known defect in this implementation, but it has a limited scope -- if this code path is used to expand a nested reusable workflow, then the `${{ input.... }}` context will be incorrect. This will require an update to the jobparser in runner version 12.4.0, and so it is out-of-scope of this PR.
## Checklist
The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org).
### Tests
- I added test coverage for Go changes...
- [x] in their respective `*_test.go` for unit tests.
- [ ] in the `tests/integration` directory if it involves interactions with a live Forgejo server.
- I added test coverage for JavaScript changes...
- [ ] in `web_src/js/*.test.js` if it can be unit tested.
- [ ] in `tests/e2e/*.test.e2e.js` if it requires interactions with a live Forgejo server (see also the [developer guide for JavaScript testing](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/tests/e2e/README.md#end-to-end-tests)).
- **end-to-end test:** will require the noted "known defect" to be resolved, but tests are authored at https://code.forgejo.org/forgejo/end-to-end/compare/main...mfenniak:expand-reusable-workflows-needs
### Documentation
- [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change.
- [x] I did not document these changes and I do not expect someone else to do it.
### Release notes
- [ ] I do not want this change to show in the release notes.
- [x] I want the title to show in the release notes with a link to this pull request.
- [ ] I want the content of the `release-notes/<pull request number>.md` to be be used for the release notes instead of the title.
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/10647
Reviewed-by: Andreas Ahlenstorf <aahlenst@noreply.codeberg.org>
Co-authored-by: Mathieu Fenniak <mathieu@fenniak.net>
Co-committed-by: Mathieu Fenniak <mathieu@fenniak.net>
377 lines
12 KiB
Go
377 lines
12 KiB
Go
// Copyright 2025 The Forgejo Authors. All rights reserved.
|
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
|
|
|
package actions
|
|
|
|
import (
|
|
"fmt"
|
|
"testing"
|
|
|
|
"forgejo.org/models/db"
|
|
repo_model "forgejo.org/models/repo"
|
|
"forgejo.org/models/unittest"
|
|
"forgejo.org/modules/cache"
|
|
|
|
"code.forgejo.org/forgejo/runner/v12/act/jobparser"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestGetRunBefore(t *testing.T) {
|
|
}
|
|
|
|
func TestSetConcurrencyGroup(t *testing.T) {
|
|
run := ActionRun{}
|
|
run.SetConcurrencyGroup("abc123")
|
|
assert.Equal(t, "abc123", run.ConcurrencyGroup)
|
|
run.SetConcurrencyGroup("ABC123") // case should collapse in SetConcurrencyGroup
|
|
assert.Equal(t, "abc123", run.ConcurrencyGroup)
|
|
}
|
|
|
|
func TestSetDefaultConcurrencyGroup(t *testing.T) {
|
|
run := ActionRun{
|
|
Ref: "refs/heads/main",
|
|
WorkflowID: "testing",
|
|
TriggerEvent: "pull_request",
|
|
}
|
|
run.SetDefaultConcurrencyGroup()
|
|
assert.Equal(t, "refs/heads/main_testing_pull_request__auto", run.ConcurrencyGroup)
|
|
run = ActionRun{
|
|
Ref: "refs/heads/main",
|
|
WorkflowID: "TESTING", // case should collapse in SetDefaultConcurrencyGroup
|
|
TriggerEvent: "pull_request",
|
|
}
|
|
run.SetDefaultConcurrencyGroup()
|
|
assert.Equal(t, "refs/heads/main_testing_pull_request__auto", run.ConcurrencyGroup)
|
|
}
|
|
|
|
func TestRepoNumOpenActions(t *testing.T) {
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
|
err := cache.Init()
|
|
require.NoError(t, err)
|
|
|
|
t.Run("Repo 1", func(t *testing.T) {
|
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
|
|
clearRepoRunCountCache(t.Context(), repo)
|
|
assert.Equal(t, 0, RepoNumOpenActions(t.Context(), repo.ID))
|
|
})
|
|
|
|
t.Run("Repo 4", func(t *testing.T) {
|
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 4})
|
|
clearRepoRunCountCache(t.Context(), repo)
|
|
assert.Equal(t, 0, RepoNumOpenActions(t.Context(), repo.ID))
|
|
})
|
|
|
|
t.Run("Repo 63", func(t *testing.T) {
|
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 63})
|
|
clearRepoRunCountCache(t.Context(), repo)
|
|
assert.Equal(t, 1, RepoNumOpenActions(t.Context(), repo.ID))
|
|
})
|
|
|
|
t.Run("Cache Invalidation", func(t *testing.T) {
|
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 63})
|
|
assert.Equal(t, 1, RepoNumOpenActions(t.Context(), repo.ID))
|
|
|
|
err = db.DeleteBeans(t.Context(), &ActionRun{RepoID: repo.ID})
|
|
require.NoError(t, err)
|
|
|
|
// Even though we've deleted ActionRun, expecting that the number of open runs is still 1 (cached)
|
|
assert.Equal(t, 1, RepoNumOpenActions(t.Context(), repo.ID))
|
|
|
|
// Now that we clear the cache, computation should be performed
|
|
clearRepoRunCountCache(t.Context(), repo)
|
|
assert.Equal(t, 0, RepoNumOpenActions(t.Context(), repo.ID))
|
|
})
|
|
}
|
|
|
|
func TestActionRun_GetRunsNotDoneByRepoIDAndPullRequestPosterID(t *testing.T) {
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
repoID := int64(10)
|
|
pullRequestID := int64(3)
|
|
pullRequestPosterID := int64(30)
|
|
|
|
runDone := &ActionRun{
|
|
RepoID: repoID,
|
|
PullRequestID: pullRequestID,
|
|
PullRequestPosterID: pullRequestPosterID,
|
|
Status: StatusSuccess,
|
|
}
|
|
require.NoError(t, InsertRun(t.Context(), runDone, nil))
|
|
|
|
unrelatedUser := int64(5)
|
|
runNotByPoster := &ActionRun{
|
|
RepoID: repoID,
|
|
PullRequestID: pullRequestID,
|
|
PullRequestPosterID: unrelatedUser,
|
|
Status: StatusRunning,
|
|
}
|
|
require.NoError(t, InsertRun(t.Context(), runNotByPoster, nil))
|
|
|
|
unrelatedRepository := int64(6)
|
|
runNotInTheSameRepository := &ActionRun{
|
|
RepoID: unrelatedRepository,
|
|
PullRequestID: pullRequestID,
|
|
PullRequestPosterID: pullRequestPosterID,
|
|
Status: StatusSuccess,
|
|
}
|
|
require.NoError(t, InsertRun(t.Context(), runNotInTheSameRepository, nil))
|
|
|
|
for _, status := range []Status{StatusUnknown, StatusWaiting, StatusRunning} {
|
|
t.Run(fmt.Sprintf("%s", status), func(t *testing.T) {
|
|
runNotDone := &ActionRun{
|
|
RepoID: repoID,
|
|
PullRequestID: pullRequestID,
|
|
Status: status,
|
|
PullRequestPosterID: pullRequestPosterID,
|
|
}
|
|
require.NoError(t, InsertRun(t.Context(), runNotDone, nil))
|
|
runs, err := GetRunsNotDoneByRepoIDAndPullRequestPosterID(t.Context(), repoID, pullRequestPosterID)
|
|
require.NoError(t, err)
|
|
require.Len(t, runs, 1)
|
|
run := runs[0]
|
|
assert.Equal(t, runNotDone.ID, run.ID)
|
|
assert.Equal(t, runNotDone.Status, run.Status)
|
|
unittest.AssertSuccessfulDelete(t, run)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestActionRun_NeedApproval(t *testing.T) {
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
pullRequestPosterID := int64(4)
|
|
repoID := int64(10)
|
|
pullRequestID := int64(2)
|
|
runDoesNotNeedApproval := &ActionRun{
|
|
RepoID: repoID,
|
|
PullRequestID: pullRequestID,
|
|
PullRequestPosterID: pullRequestPosterID,
|
|
}
|
|
require.NoError(t, InsertRun(t.Context(), runDoesNotNeedApproval, nil))
|
|
unrelatedRepository := int64(6)
|
|
runNotInTheSameRepository := &ActionRun{
|
|
RepoID: unrelatedRepository,
|
|
PullRequestID: pullRequestID,
|
|
PullRequestPosterID: pullRequestPosterID,
|
|
NeedApproval: true,
|
|
}
|
|
require.NoError(t, InsertRun(t.Context(), runNotInTheSameRepository, nil))
|
|
unrelatedPullRequest := int64(3)
|
|
runNotInTheSamePullRequest := &ActionRun{
|
|
RepoID: repoID,
|
|
PullRequestID: unrelatedPullRequest,
|
|
PullRequestPosterID: pullRequestPosterID,
|
|
NeedApproval: true,
|
|
}
|
|
require.NoError(t, InsertRun(t.Context(), runNotInTheSamePullRequest, nil))
|
|
|
|
t.Run("HasRunThatNeedApproval is false", func(t *testing.T) {
|
|
has, err := HasRunThatNeedApproval(t.Context(), repoID, pullRequestID)
|
|
require.NoError(t, err)
|
|
assert.False(t, has)
|
|
})
|
|
|
|
runNeedApproval := &ActionRun{
|
|
RepoID: repoID,
|
|
PullRequestID: pullRequestID,
|
|
PullRequestPosterID: pullRequestPosterID,
|
|
NeedApproval: true,
|
|
}
|
|
require.NoError(t, InsertRun(t.Context(), runNeedApproval, nil))
|
|
|
|
t.Run("HasRunThatNeedApproval is true", func(t *testing.T) {
|
|
has, err := HasRunThatNeedApproval(t.Context(), repoID, pullRequestID)
|
|
require.NoError(t, err)
|
|
assert.True(t, has)
|
|
})
|
|
|
|
assertApprovalEqual := func(t *testing.T, expected, actual *ActionRun) {
|
|
t.Helper()
|
|
assert.Equal(t, expected.RepoID, actual.RepoID)
|
|
assert.Equal(t, expected.PullRequestID, actual.PullRequestID)
|
|
assert.Equal(t, expected.PullRequestPosterID, actual.PullRequestPosterID)
|
|
assert.Equal(t, expected.NeedApproval, actual.NeedApproval)
|
|
}
|
|
|
|
t.Run("GetRunsThatNeedApproval", func(t *testing.T) {
|
|
runs, err := GetRunsThatNeedApprovalByRepoIDAndPullRequestID(t.Context(), repoID, pullRequestID)
|
|
require.NoError(t, err)
|
|
require.Len(t, runs, 1)
|
|
assertApprovalEqual(t, runNeedApproval, runs[0])
|
|
})
|
|
}
|
|
|
|
func TestActionRun_IncompleteMatrix(t *testing.T) {
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
pullRequestPosterID := int64(4)
|
|
repoID := int64(10)
|
|
pullRequestID := int64(2)
|
|
runDoesNotNeedApproval := &ActionRun{
|
|
RepoID: repoID,
|
|
PullRequestID: pullRequestID,
|
|
PullRequestPosterID: pullRequestPosterID,
|
|
}
|
|
|
|
workflowRaw := []byte(`
|
|
jobs:
|
|
job2:
|
|
runs-on: ubuntu-latest
|
|
strategy:
|
|
matrix:
|
|
dim1: "${{ fromJSON(needs.other-job.outputs.some-output) }}"
|
|
steps:
|
|
- run: true
|
|
`)
|
|
workflows, err := jobparser.Parse(workflowRaw, false, jobparser.WithJobOutputs(map[string]map[string]string{}))
|
|
require.NoError(t, err)
|
|
require.True(t, workflows[0].IncompleteMatrix) // must be set for this test scenario to be valid
|
|
|
|
require.NoError(t, InsertRun(t.Context(), runDoesNotNeedApproval, workflows))
|
|
|
|
jobs, err := db.Find[ActionRunJob](t.Context(), FindRunJobOptions{RunID: runDoesNotNeedApproval.ID})
|
|
require.NoError(t, err)
|
|
require.Len(t, jobs, 1)
|
|
job := jobs[0]
|
|
|
|
// Expect job with an incomplete matrix to be StatusBlocked:
|
|
assert.Equal(t, StatusBlocked, job.Status)
|
|
}
|
|
|
|
func TestActionRun_IncompleteRunsOn(t *testing.T) {
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
pullRequestPosterID := int64(4)
|
|
repoID := int64(10)
|
|
pullRequestID := int64(2)
|
|
runDoesNotNeedApproval := &ActionRun{
|
|
RepoID: repoID,
|
|
PullRequestID: pullRequestID,
|
|
PullRequestPosterID: pullRequestPosterID,
|
|
}
|
|
|
|
workflowRaw := []byte(`
|
|
jobs:
|
|
job2:
|
|
runs-on: ${{ needs.other-job.outputs.some-output }}
|
|
steps:
|
|
- run: true
|
|
`)
|
|
workflows, err := jobparser.Parse(workflowRaw, false, jobparser.WithJobOutputs(map[string]map[string]string{}), jobparser.SupportIncompleteRunsOn())
|
|
require.NoError(t, err)
|
|
require.True(t, workflows[0].IncompleteRunsOn) // must be set for this test scenario to be valid
|
|
|
|
require.NoError(t, InsertRun(t.Context(), runDoesNotNeedApproval, workflows))
|
|
|
|
jobs, err := db.Find[ActionRunJob](t.Context(), FindRunJobOptions{RunID: runDoesNotNeedApproval.ID})
|
|
require.NoError(t, err)
|
|
require.Len(t, jobs, 1)
|
|
job := jobs[0]
|
|
|
|
// Expect job with an incomplete runs-on to be StatusBlocked:
|
|
assert.Equal(t, StatusBlocked, job.Status)
|
|
}
|
|
|
|
func TestActionRun_FindOuterWorkflowCall(t *testing.T) {
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
pullRequestPosterID := int64(4)
|
|
repoID := int64(10)
|
|
pullRequestID := int64(2)
|
|
run := &ActionRun{
|
|
RepoID: repoID,
|
|
PullRequestID: pullRequestID,
|
|
PullRequestPosterID: pullRequestPosterID,
|
|
}
|
|
|
|
workflowRaw := []byte(`
|
|
jobs:
|
|
outer-job:
|
|
uses: ./.forgejo/workflows/reusable.yml
|
|
`)
|
|
workflows, err := jobparser.Parse(workflowRaw, false,
|
|
jobparser.WithJobOutputs(map[string]map[string]string{}),
|
|
jobparser.ExpandLocalReusableWorkflows(func(job *jobparser.Job, path string) ([]byte, error) {
|
|
return []byte(`
|
|
on:
|
|
workflow_call:
|
|
jobs:
|
|
inner-job-1:
|
|
runs-on: debian
|
|
steps: []
|
|
inner-job-2:
|
|
runs-on: debian
|
|
steps: []
|
|
`), nil
|
|
}))
|
|
require.NoError(t, err)
|
|
require.NoError(t, InsertRun(t.Context(), run, workflows))
|
|
|
|
jobs, err := db.Find[ActionRunJob](t.Context(), FindRunJobOptions{RunID: run.ID})
|
|
require.NoError(t, err)
|
|
require.Len(t, jobs, 3)
|
|
|
|
for _, j := range jobs {
|
|
t.Run(j.Name, func(t *testing.T) {
|
|
_, err := j.DecodeWorkflowPayload()
|
|
require.NoError(t, err)
|
|
outer, err := run.FindOuterWorkflowCall(t.Context(), j)
|
|
if j.Name == "outer-job" {
|
|
require.ErrorContains(t, err, "invalid state for FindOuterWorkflowCall")
|
|
} else {
|
|
require.NoError(t, err)
|
|
require.NotNil(t, outer)
|
|
assert.Equal(t, "outer-job", outer.Name)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestActionRun_IncompleteWith(t *testing.T) {
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
pullRequestPosterID := int64(4)
|
|
repoID := int64(10)
|
|
pullRequestID := int64(2)
|
|
runDoesNotNeedApproval := &ActionRun{
|
|
RepoID: repoID,
|
|
PullRequestID: pullRequestID,
|
|
PullRequestPosterID: pullRequestPosterID,
|
|
}
|
|
|
|
workflowRaw := []byte(`
|
|
jobs:
|
|
outer-job:
|
|
with:
|
|
some_input: ${{ needs.other-job.outputs.some-output }}
|
|
uses: ./.forgejo/workflows/reusable.yml
|
|
`)
|
|
workflows, err := jobparser.Parse(workflowRaw, false,
|
|
jobparser.WithJobOutputs(map[string]map[string]string{}),
|
|
jobparser.ExpandLocalReusableWorkflows(func(job *jobparser.Job, path string) ([]byte, error) {
|
|
return []byte(`
|
|
on:
|
|
workflow_call:
|
|
inputs:
|
|
some_input:
|
|
type: string
|
|
jobs:
|
|
inner-job:
|
|
runs-on: debian
|
|
steps: []
|
|
`), nil
|
|
}))
|
|
require.NoError(t, err)
|
|
require.True(t, workflows[0].IncompleteWith) // must be set for this test scenario to be valid
|
|
|
|
require.NoError(t, InsertRun(t.Context(), runDoesNotNeedApproval, workflows))
|
|
|
|
jobs, err := db.Find[ActionRunJob](t.Context(), FindRunJobOptions{RunID: runDoesNotNeedApproval.ID})
|
|
require.NoError(t, err)
|
|
require.Len(t, jobs, 1)
|
|
job := jobs[0]
|
|
|
|
// Expect job with an incomplete with to be StatusBlocked:
|
|
assert.Equal(t, StatusBlocked, job.Status)
|
|
}
|