Gitea/Runner
4
0
Fork 0
mirror of https://gitea.com/gitea/runner.git synced 2026-08-25 21:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

enhance: download each action repository once per job (#1178)

Browse Source 
A job downloads each action repository once, keyed on the clone URL and ref, so repeated `uses:` and different paths of one repository share a checkout. The download is reported once as `{org}/{repo}@{ref}`, the way actions/runner reports it.

The action itself is still read per step, because a repository without an action file gets a synthetic action built from that step's `with.args`.

Fixes https://gitea.com/gitea/runner/issues/1159

---------

Co-authored-by: silverwind <me@silverwind.io>
Reviewed-on: https://gitea.com/gitea/runner/pulls/1178
Reviewed-by: bircni <bircni@icloud.com>
Reviewed-by: silverwind <2021+silverwind@noreply.gitea.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
Lunny Xiao
2026-08-22 17:01:39 +00:00
committed by silverwind
parent 2fa5fe7121
commit c0a07cfb72
11 changed files with 241 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/act/runner/toolkit_patch.go
+12 -6
View File
@@ -111,11 +111,11 @@ func actionScriptPaths(dir string, action *model.Action) []string {
// patchToolkit edits the toolkit in an action's bundles, keeping each original beside them. Every
// failure is silent and leaves the bundle as it was, which costs the cache client the v2 API and
// an artifact action nothing at all.
func patchToolkit(ctx context.Context, actionDir string, scripts []string) {
func patchToolkit(ctx context.Context, actionDir, actionLocation string, scripts []string) {
if len(scripts) == 0 {
return
}
if _, err := os.Stat(filepath.Join(sidecarDir(actionDir), skipMarker)); err == nil {
if _, err := os.Stat(skipMarkerFor(actionDir, actionLocation)); err == nil {
return
}
defer git.AcquireCloneLock(actionDir)()
@@ -130,7 +130,7 @@ func patchToolkit(ctx context.Context, actionDir string, scripts []string) {
// revertToolkit puts the originals back and stops this action being patched again, so the next job
// runs it exactly as shipped. Called when a step failed with a patched bundle; it does not re-run
// the step, because a step's outputs and env-file writes are already recorded by then.
func revertToolkit(ctx context.Context, actionDir string, scripts []string) {
func revertToolkit(ctx context.Context, actionDir, actionLocation string, scripts []string) {
if len(scripts) == 0 {
return
}
@@ -150,16 +150,22 @@ func revertToolkit(ctx context.Context, actionDir string, scripts []string) {
}
}
if reverted {
_ = os.WriteFile(filepath.Join(sidecarDir(actionDir), skipMarker), nil, 0o600)
common.Logger(ctx).Warnf("actions toolkit: restored the original %s, it will not be patched again", filepath.Base(actionDir))
_ = os.WriteFile(skipMarkerFor(actionDir, actionLocation), nil, 0o600)
common.Logger(ctx).Warnf("actions toolkit: restored the original %s, it will not be patched again", filepath.Base(actionLocation))
}
}
// sidecarDir holds an action's untouched bundles, and the marker that stops it being patched.
// sidecarDir holds a checkout's untouched bundles, and the markers that stop actions being patched.
func sidecarDir(actionDir string) string {
return actionDir + sidecarSuffix
}
// skipMarkerFor stops one action being patched again. It sits among that action's own originals, so
// a sibling action sharing the checkout keeps being patched.
func skipMarkerFor(actionDir, actionLocation string) string {
return originalFor(actionDir, filepath.Join(actionLocation, skipMarker))
}
// originalFor is where a script's untouched copy lives, or "" for a script the action's own
// `runs` keys placed outside its directory, which is not this runner's to rewrite.
func originalFor(actionDir, script string) string {