From 4e77a1cd39fac6fa14a62902c6c55bc77e98cd8e Mon Sep 17 00:00:00 2001 From: Valery Piashchynski Date: Mon, 15 Jan 2024 13:37:18 +0100 Subject: [PATCH 1/2] fix: properly set replace directive for GitHub Signed-off-by: Valery Piashchynski --- github/pool.go | 1 + velox_rr_v2023.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/github/pool.go b/github/pool.go index ec8c9bb..8e95779 100644 --- a/github/pool.go +++ b/github/pool.go @@ -154,6 +154,7 @@ func (p *processor) run() { modInfo.PseudoVersion = velox.ParseModuleInfo(modInfo.ModuleName, at.Time, commits[0].GetSHA()[:12]) if v.pluginCfg.Replace != "" { + modInfo.Replace = v.pluginCfg.Replace p.log.Debug("[REPLACE REQUESTED]", zap.String("plugin", v.name), zap.String("path", v.pluginCfg.Replace)) } diff --git a/velox_rr_v2023.toml b/velox_rr_v2023.toml index cecb207..de634eb 100644 --- a/velox_rr_v2023.toml +++ b/velox_rr_v2023.toml @@ -6,7 +6,7 @@ build_args = [ ] [roadrunner] -ref = "v2023.3.8" +ref = "v2023.3.9" [github] [github.token] From f7f03919866eac98913b5e5149fe3dddeba517a8 Mon Sep 17 00:00:00 2001 From: Valery Piashchynski Date: Mon, 15 Jan 2024 13:40:12 +0100 Subject: [PATCH 2/2] chore: formatting Signed-off-by: Valery Piashchynski --- github/repo.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/github/repo.go b/github/repo.go index 0114491..ee9b6a5 100644 --- a/github/repo.go +++ b/github/repo.go @@ -22,6 +22,7 @@ import ( const ( rrOwner string = "roadrunner-server" rrRepo string = "roadrunner" + zipExt string = ".zip" ) /* @@ -84,8 +85,8 @@ func (r *GHRepo) DownloadTemplate(tmp, version string) (string, error) { //nolin name := path.Join(tmp, "roadrunner-server-"+version) _ = os.RemoveAll(name) - r.log.Debug("[FLUSHING DATA ON THE DISK]", zap.String("path", name+".zip")) - f, err := os.Create(name + ".zip") + r.log.Debug("[FLUSHING DATA ON THE DISK]", zap.String("path", name+zipExt)) + f, err := os.Create(name + zipExt) if err != nil { return "", err } @@ -101,7 +102,7 @@ func (r *GHRepo) DownloadTemplate(tmp, version string) (string, error) { //nolin r.log.Debug("[SAVED]", zap.Int("bytes written", n)) - rc, err := zip.OpenReader(name + ".zip") + rc, err := zip.OpenReader(name + zipExt) if err != nil { return "", err }