20846: Merge branch 'main' into 20846-ruby3

[arvados.git] / lib / install / deps.go

diff --git a/lib/install/deps.go b/lib/install/deps.go
index a5cfe879524b258656a235a22d5a869a062c9a25..7b32984348346b24e4a2106b94dba8a1582bbd8a 100644 (file)
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -49,6 +49,7 @@ var arvadosServiceFile []byte
 type installCommand struct {
        ClusterType    string
        SourcePath     string
+       Commit         string
        PackageVersion string
        EatMyData      bool
 }
@@ -71,6 +72,7 @@ func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read
        versionFlag := flags.Bool("version", false, "Write version information to stdout and exit 0")
        flags.StringVar(&inst.ClusterType, "type", "production", "cluster `type`: development, test, production, or package")
        flags.StringVar(&inst.SourcePath, "source", "/arvados", "source tree location (required for -type=package)")
+       flags.StringVar(&inst.Commit, "commit", "", "source commit `hash` to embed (blank means use 'git log' or all-zero placeholder)")
        flags.StringVar(&inst.PackageVersion, "package-version", "0.0.0", "version string to embed in executable files")
        flags.BoolVar(&inst.EatMyData, "eatmydata", false, "use eatmydata to speed up install")
 
@@ -80,6 +82,14 @@ func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read
                return cmd.Version.RunCommand(prog, args, stdin, stdout, stderr)
        }
 
+       if inst.Commit == "" {
+               if commit, err := exec.Command("env", "-C", inst.SourcePath, "git", "log", "-n1", "--format=%H").CombinedOutput(); err == nil {
+                       inst.Commit = strings.TrimSpace(string(commit))
+               } else {
+                       inst.Commit = "0000000000000000000000000000000000000000"
+               }
+       }
+
        var dev, test, prod, pkg bool
        switch inst.ClusterType {
        case "development":
@@ -566,7 +576,10 @@ ln -sfv /var/lib/arvados/node-`+nodejsversion+`-linux-x64/bin/{yarn,yarnpkg} /us
                        // container using a non-root-owned git tree
                        // mounted from the host -- as in
                        // "arvados-package build".
-                       cmd := exec.Command("go", "install", "-buildvcs=false", "-ldflags", "-X git.arvados.org/arvados.git/lib/cmd.version="+inst.PackageVersion+" -X main.version="+inst.PackageVersion+" -s -w")
+                       cmd := exec.Command("go", "install", "-buildvcs=false",
+                               "-ldflags", "-s -w"+
+                                       " -X git.arvados.org/arvados.git/lib/cmd.version="+inst.PackageVersion+
+                                       " -X git.arvados.org/arvados.git/lib/cmd.commit="+inst.Commit)
                        cmd.Env = append(cmd.Env, os.Environ()...)
                        cmd.Env = append(cmd.Env, "GOBIN=/var/lib/arvados/bin")
                        cmd.Dir = filepath.Join(inst.SourcePath, srcdir)
@@ -601,7 +614,7 @@ v=/var/lib/arvados/lib/python
 tmp=/var/lib/arvados/tmp/python
 python3 -m venv "$v"
 . "$v/bin/activate"
-pip3 install --no-cache-dir 'setuptools>=62.4.0' 'pip>=7'
+pip3 install --no-cache-dir 'setuptools>=68' 'pip>=20'
 export ARVADOS_BUILDING_VERSION="`+inst.PackageVersion+`"
 for src in "`+inst.SourcePath+`/sdk/python" "`+inst.SourcePath+`/services/fuse"; do
   rsync -a --delete-after "$src/" "$tmp/"
@@ -691,11 +704,13 @@ done
                // BUILD_PATH=/var/lib/arvados/workbench2) instead of
                // using two rsync steps here.
                if err = inst.runBash(`
+src="`+inst.SourcePath+`/services/workbench2"
 tmp=/var/lib/arvados/tmp/workbench2
 trap "rm -r ${tmp}" ERR EXIT
-rsync -a --delete-after `+inst.SourcePath+`/services/workbench2/ "$tmp/"
-env -C "$tmp" VERSION="`+inst.PackageVersion+`" BUILD_NUMBER=1 GIT_COMMIT=000000000 yarn build
-rsync -a --delete-after "$tmp/build/" /var/lib/arvados/workbench2/
+dst=/var/lib/arvados/workbench2
+rsync -a --delete-after "$src/" "$tmp/"
+env -C "$tmp" VERSION="`+inst.PackageVersion+`" BUILD_NUMBER=1 GIT_COMMIT="`+inst.Commit[:9]+`" yarn build
+rsync -a --delete-after "$tmp/build/" "$dst/"
 `, stdout, stderr); err != nil {
                        return 1
                }