ink/act_runner
1
1
Fork 0
mirror of https://gitea.com/gitea/act_runner.git synced 2026-03-25 00:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: move getContainerActionPaths into step interface (#13)

Browse Source 
* allows to specialize local vs remote action implementation
* allow paths like ./.. for local action

Closes https://gitea.com/actions-oss/act-cli/issues/12

Reviewed-on: https://gitea.com/actions-oss/act-cli/pulls/13
Co-authored-by: ChristopherHX <christopher.homberger@web.de>
Co-committed-by: ChristopherHX <christopher.homberger@web.de>
This commit is contained in:
ChristopherHX
2025-12-19 16:24:48 +00:00
committed by ChristopherHX
parent ee2e0135d5
commit ce0890578a
11 changed files with 196 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
pkg/runner/step_action_remote.go
View File

@@ -121,9 +121,7 @@ func (sar *stepActionRemote) main() common.Executor {
return sar.RunContext.JobContainer.CopyDir(copyToPath, sar.RunContext.Config.Workdir+string(filepath.Separator)+".", sar.RunContext.Config.UseGitIgnore)(ctx)
}
actionDir := fmt.Sprintf("%s/%s", sar.RunContext.ActionCacheDir(), safeFilename(sar.Step.Uses))
return sar.runAction(sar, actionDir, sar.remoteAction)(ctx)
return sar.runAction(sar)(ctx)
}),
)
}
@@ -178,11 +176,42 @@ func (sar *stepActionRemote) getActionModel() *model.Action {
return sar.action
}
func (sar *stepActionRemote) getContainerActionPaths() (string, string) {
return sar.getContainerActionPathsExt(sar.getActionPath())
}
func (sar *stepActionRemote) getContainerActionPathsExt(subPath string) (string, string) {
cacheDir := sar.RunContext.ActionCacheDir()
actionDir := filepath.Join(cacheDir, safeFilename(sar.Step.Uses), subPath)
actionName := getOsSafeRelativePath(actionDir, cacheDir)
containerActionDir := sar.RunContext.JobContainer.GetActPath() + "/actions/" + actionName
return actionName, containerActionDir
}
func (sar *stepActionRemote) getTarArchive(ctx context.Context, src string) (io.ReadCloser, error) {
return sar.RunContext.getActionCache().GetTarArchive(ctx, sar.cacheDir, sar.resolvedSha, src)
}
func (sar *stepActionRemote) getActionPath() string {
return sar.remoteAction.Path
}
func (sar *stepActionRemote) maybeCopyToActionDir(ctx context.Context) error {
rc := sar.getRunContext()
_, containerRootPath := sar.getContainerActionPathsExt("")
ta, err := sar.getTarArchive(ctx, "")
if err != nil {
return err
}
defer ta.Close()
return rc.JobContainer.CopyTarStream(ctx, strings.TrimSuffix(containerRootPath, "/")+"/", ta)
}
func (sar *stepActionRemote) getCompositeRunContext(ctx context.Context) *RunContext {
if sar.compositeRunContext == nil {
actionDir := fmt.Sprintf("%s/%s", sar.RunContext.ActionCacheDir(), safeFilename(sar.Step.Uses))
actionLocation := path.Join(actionDir, sar.remoteAction.Path)
_, containerActionDir := getContainerActionPaths(sar.getStepModel(), actionLocation, sar.RunContext)
_, containerActionDir := sar.getContainerActionPaths()
sar.compositeRunContext = newCompositeRunContext(ctx, sar.RunContext, sar, containerActionDir)
sar.compositeSteps = sar.compositeRunContext.compositeExecutor(sar.action)