gitlab: 12.1.6 -> 12.3.4
- Update GitLab to 12.3.4 - Update update.py to cope with the new upstream repository structure - Refactor gitlab-shell to use buildGoPackage and bundlerEnv for dependencies - Refactor gitlab-workhorse to use buildGoPackage for dependencies - Make update.py able to update gitlab-shell and gitlab-workhorse dependencies - Various fixes necessary for update to work
This commit is contained in:
@@ -60,12 +60,10 @@ diff --git a/go/internal/command/fallback/fallback.go b/go/internal/command/fall
|
||||
index 2cb76a8..f59ad5e 100644
|
||||
--- a/go/internal/command/fallback/fallback.go
|
||||
+++ b/go/internal/command/fallback/fallback.go
|
||||
@@ -21,7 +21,7 @@
|
||||
)
|
||||
@@ -53,5 +53,5 @@
|
||||
func (c *Command) fallbackProgram() string {
|
||||
fileName := fmt.Sprintf("%s-ruby", c.Executable.Name)
|
||||
|
||||
func (c *Command) Execute() error {
|
||||
- rubyCmd := filepath.Join(c.RootDir, "bin", RubyProgram)
|
||||
+ rubyCmd := filepath.Join("/run/current-system/sw/bin", RubyProgram)
|
||||
|
||||
// Ensure rubyArgs[0] is the full path to gitlab-shell-ruby
|
||||
rubyArgs := append([]string{rubyCmd}, c.Args[1:]...)
|
||||
- return filepath.Join(c.RootDir, "bin", fileName)
|
||||
+ return filepath.Join("/run/current-system/sw/bin", fileName)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user