diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2020-06-19 22:56:22 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2020-06-19 22:56:22 +0000 |
| commit | c3ad661174e3f770b100812c6075f2ca092e9c2a (patch) | |
| tree | 3dfcf540eb4c49e05d1b97de4492f9e00bec4db0 /user/gitlab-runner/clean-tmpdirs.patch | |
| parent | b39942321d371aaa6fa453bf06cb55089bbe7444 (diff) | |
| parent | c4d87ab64fb1a3a1a89e6e0cb8d4b7291e511c1d (diff) | |
| download | packages-c3ad661174e3f770b100812c6075f2ca092e9c2a.tar.gz packages-c3ad661174e3f770b100812c6075f2ca092e9c2a.tar.bz2 packages-c3ad661174e3f770b100812c6075f2ca092e9c2a.tar.xz packages-c3ad661174e3f770b100812c6075f2ca092e9c2a.zip | |
Merge branch 'gitlab-runner' into 'master'
user/gitlab-runner: new package
See merge request adelie/packages!467
Diffstat (limited to 'user/gitlab-runner/clean-tmpdirs.patch')
| -rw-r--r-- | user/gitlab-runner/clean-tmpdirs.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/user/gitlab-runner/clean-tmpdirs.patch b/user/gitlab-runner/clean-tmpdirs.patch new file mode 100644 index 000000000..89efd7a22 --- /dev/null +++ b/user/gitlab-runner/clean-tmpdirs.patch @@ -0,0 +1,21 @@ +Backport of: https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/1978 + +--- gitlab-runner-v12.1.0/executors/custom/executor.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/executors/custom/executor.go 2020-04-27 00:19:46.613372635 +0000 +@@ -7,6 +7,7 @@ import ( + "fmt" + "io" + "io/ioutil" ++ "os" + "path/filepath" + + "github.com/sirupsen/logrus" +@@ -216,6 +217,8 @@ func (e *executor) Cleanup() { + return + } + ++ defer os.RemoveAll(e.tempDir) ++ + // nothing to do, as there's no cleanup_script + if e.config.CleanupExec == "" { + return |