mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-03-27 09:43:05 -04:00
71623b1ab1
Some checks are pending
/ release (push) Waiting to run
testing-integration / test-unit (push) Waiting to run
testing-integration / test-sqlite (push) Waiting to run
testing-integration / test-mariadb (v10.6) (push) Waiting to run
testing-integration / test-mariadb (v11.8) (push) Waiting to run
testing / backend-checks (push) Waiting to run
testing / frontend-checks (push) Waiting to run
testing / test-unit (push) Blocked by required conditions
testing / test-e2e (push) Blocked by required conditions
testing / test-remote-cacher (redis) (push) Blocked by required conditions
testing / test-remote-cacher (valkey) (push) Blocked by required conditions
testing / test-remote-cacher (garnet) (push) Blocked by required conditions
testing / test-remote-cacher (redict) (push) Blocked by required conditions
testing / test-mysql (push) Blocked by required conditions
testing / test-pgsql (push) Blocked by required conditions
testing / test-sqlite (push) Blocked by required conditions
testing / security-check (push) Blocked by required conditions
Previously, Forgejo's behaviour for an Actions reusable workflow was to send the entire job to one specific Forgejo Runner based upon its required `runs-on` label, and that single Runner would then read the workflow file and perform all the jobs inside simultaneously, merging their log output into one output (#9768). This PR begins an implementation of expanding reusable workflows into their internal jobs. In this PR, the most basic support is implemented for expanding reusable workflows: - If a `runs-on` field is provided on the workflow, then the legacy behaviour of sending the reusable workflow to a runner is maintained. - If the `runs-on` field is omitted, then the job may be expanded, if: - If the `uses:` is a local path within the repo -- expanded - If the `uses:` is a path to another repo that is on the same Forgejo server -- expanded - If the `uses:` is a fully-qualified URL -- not expanded Because this is an "opt-in" implementation by omitting `runs-on`, and all existing capability is retained, I've **omitted some features** from this PR to make the scope small and manageable for review and testing. These features will be implemented after the initial support is landed: - Workflow input variables - Workflow secrets - Workflow output variables - "Incomplete" workflows which require multiple passes to evaluate -- any job within a reusable workflow where the `with`, `runs-on`, or `strategy.matrix` fields contain an output from another job with `${{ needs... }}` Although this implementation has restrictions with missing features, it is intended to fix #9768. Replaces PR #10448. ## 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 testing: https://code.forgejo.org/forgejo/end-to-end/pulls/1316 ### Documentation - [x] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change. - https://codeberg.org/forgejo/docs/pulls/1648 - [ ] 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/10525 Reviewed-by: Andreas Ahlenstorf <aahlenst@noreply.codeberg.org> Co-authored-by: Mathieu Fenniak <mathieu@fenniak.net> Co-committed-by: Mathieu Fenniak <mathieu@fenniak.net>
78 lines
2.7 KiB
Go
78 lines
2.7 KiB
Go
// Copyright 2025 The Forgejo Authors. All rights reserved.
|
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
|
|
|
package actions
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"forgejo.org/models/db"
|
|
"forgejo.org/models/unittest"
|
|
"forgejo.org/modules/timeutil"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestActionTask_GetAllAttempts(t *testing.T) {
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
var task ActionTask
|
|
has, err := db.GetEngine(t.Context()).Where("id=?", 47).Get(&task)
|
|
require.NoError(t, err)
|
|
require.True(t, has, "load ActionTask from fixture")
|
|
|
|
allAttempts, err := task.GetAllAttempts(t.Context())
|
|
require.NoError(t, err)
|
|
require.Len(t, allAttempts, 3)
|
|
assert.EqualValues(t, 47, allAttempts[0].ID, "ordered by attempt, 1")
|
|
assert.EqualValues(t, 53, allAttempts[1].ID, "ordered by attempt, 2")
|
|
assert.EqualValues(t, 52, allAttempts[2].ID, "ordered by attempt, 3")
|
|
|
|
// GetAllAttempts doesn't populate all fields; so check expected fields from one of the records
|
|
assert.EqualValues(t, 3, allAttempts[0].Attempt, "read Attempt field")
|
|
assert.Equal(t, StatusRunning, allAttempts[0].Status, "read Status field")
|
|
assert.Equal(t, timeutil.TimeStamp(1683636528), allAttempts[0].Started, "read Started field")
|
|
}
|
|
|
|
func TestActionTask_GetTaskByJobAttempt(t *testing.T) {
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
task, err := GetTaskByJobAttempt(t.Context(), 192, 2)
|
|
require.NoError(t, err)
|
|
assert.EqualValues(t, 192, task.JobID)
|
|
assert.EqualValues(t, 2, task.Attempt)
|
|
|
|
_, err = GetTaskByJobAttempt(t.Context(), 192, 100)
|
|
assert.ErrorContains(t, err, "task with job_id 192 and attempt 100: resource does not exist")
|
|
}
|
|
|
|
func TestActionTask_CreatePlaceholderTask(t *testing.T) {
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
job := unittest.AssertExistsAndLoadBean(t, &ActionRunJob{ID: 396})
|
|
assert.EqualValues(t, 0, job.TaskID)
|
|
|
|
task, err := CreatePlaceholderTask(t.Context(), job, map[string]string{"output1": "value1", "output2": "value2"})
|
|
require.NoError(t, err)
|
|
|
|
assert.NotEqualValues(t, 0, task.ID)
|
|
assert.Equal(t, job.ID, task.JobID)
|
|
assert.EqualValues(t, 1, task.Attempt)
|
|
assert.NotEqualValues(t, 0, task.Started)
|
|
assert.NotEqualValues(t, 0, task.Stopped)
|
|
assert.Equal(t, job.Status, task.Status)
|
|
assert.Equal(t, job.RepoID, task.RepoID)
|
|
assert.Equal(t, job.OwnerID, task.OwnerID)
|
|
assert.Equal(t, job.CommitSHA, task.CommitSHA)
|
|
assert.Equal(t, job.IsForkPullRequest, task.IsForkPullRequest)
|
|
|
|
taskOutputs, err := FindTaskOutputByTaskID(t.Context(), task.ID)
|
|
require.NoError(t, err)
|
|
require.Len(t, taskOutputs, 2)
|
|
finalOutputs := map[string]string{}
|
|
for _, to := range taskOutputs {
|
|
finalOutputs[to.OutputKey] = to.OutputValue
|
|
}
|
|
assert.Equal(t, map[string]string{"output1": "value1", "output2": "value2"}, finalOutputs)
|
|
}
|