summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorearl-warren <earl-warren@noreply.code.forgejo.org>2024-11-20 12:33:46 +0100
committerearl-warren <earl-warren@noreply.code.forgejo.org>2024-11-20 12:33:46 +0100
commitd44a79e48f267e01d2a4b025230e6e2d1f81f816 (patch)
treef115b6a811e5b4adaf0a48c3f36065892e0a6a18
parentMerge pull request 'Update actions/setup-go action to v5' (#64) from renovate... (diff)
parentfix: [FORGEJO] do not share the act-toolcache volume (diff)
downloadforgejo-act-d44a79e48f267e01d2a4b025230e6e2d1f81f816.tar.xz
forgejo-act-d44a79e48f267e01d2a4b025230e6e2d1f81f816.zip
Merge pull request 'fix: [FORGEJO] do not share the act-toolcache volume' (#61) from earl-warren/act:wip-hostedtoolcache into main
Reviewed-on: https://code.forgejo.org/forgejo/act/pulls/61 Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
-rw-r--r--pkg/runner/run_context.go5
1 files changed, 1 insertions, 4 deletions
diff --git a/pkg/runner/run_context.go b/pkg/runner/run_context.go
index 06679ca..8ecdb2b 100644
--- a/pkg/runner/run_context.go
+++ b/pkg/runner/run_context.go
@@ -140,8 +140,7 @@ func (rc *RunContext) GetBindsAndMounts() ([]string, map[string]string) {
ext := container.LinuxContainerEnvironmentExtensions{}
mounts := map[string]string{
- "act-toolcache": "/opt/hostedtoolcache",
- name + "-env": ext.GetActPath(),
+ name + "-env": ext.GetActPath(),
}
if job := rc.Run.Job(); job != nil {
@@ -172,9 +171,7 @@ func (rc *RunContext) GetBindsAndMounts() ([]string, map[string]string) {
mounts[name] = ext.ToContainerPath(rc.Config.Workdir)
}
- // For Gitea
// add some default binds and mounts to ValidVolumes
- rc.Config.ValidVolumes = append(rc.Config.ValidVolumes, "act-toolcache")
rc.Config.ValidVolumes = append(rc.Config.ValidVolumes, name)
rc.Config.ValidVolumes = append(rc.Config.ValidVolumes, name+"-env")
// TODO: add a new configuration to control whether the docker daemon can be mounted