alibuild 1.17.18__tar.gz → 1.17.19__tar.gz

{alibuild-1.17.18 → alibuild-1.17.19}/.github/workflows/pr-check.yml

@@ -18,14 +18,13 @@ permissions: {}
 jobs:
   unittest:
     name: python${{ matrix.python-version }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     strategy:
       fail-fast: false   # continue executing other checks if one fails
       matrix:
         python-version:
-          - '3.6.8'   # slc7, slc8 and cs8 containers
-          - '3.8.10'  # ubuntu2004 container
+          - '3.8.18'  # ubuntu2004 container
           - '3.9.16'  # slc9 container
           - '3.10.6'  # ubuntu2204 container
           - '3.11'

{alibuild-1.17.18 → alibuild-1.17.19}/.github/workflows/release.yml

@@ -9,30 +9,28 @@ permissions:
   contents: read  # required for github.ref to be set
 
 jobs:
-  pypi:
-    name: Publish release on PyPI
+  pypi-publish:
+    name: Upload release to PyPI
     runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags/')
+    environment:
+      name: release
+      url: https://pypi.org/p/alibuild
+    permissions:
+      id-token: write  # IMPORTANT: this permission is mandatory for trusted publishing
     steps:
-      - name: Checkout alibuild
-        uses: actions/checkout@v4
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.x
-      - name: Install build dependencies   # needed by our setup.py
-        run: python -m pip install setuptools
-      - name: Build the Python distribution
-        run: python setup.py sdist
-      - name: Publish distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@v1.5.0
-        with:
-          user: __token__
-          password: ${{ secrets.pypi_password }}
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+    - name: Install build dependencies
+      run: python -m pip install --upgrade setuptools build pip
+    - name: Build the Python distribution
+      run: python -m build
+    - name: Publish package distributions to PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1
 
   brew:
     name: Update Homebrew formula
-    needs: pypi
+    needs: pypi-publish
     runs-on: macos-latest
     if: startsWith(github.ref, 'refs/tags/') && !github.event.release.prerelease
     steps:

alibuild-1.17.19/PACKAGING.md

@@ -0,0 +1,11 @@
+# Publishing on PyPi
+
+alibuild is available from PyPi. Package page at:
+
+<https://pypi.python.org/pypi/alibuild/>
+
+In order to publish a new version:
+
+- Test, test, test.
+- Create a new release in GitHub.
+- The github action should automatically create a new release and upload the package to PyPi (it's a good idea to verify that the release was created and the package uploaded).

{alibuild-1.17.18 → alibuild-1.17.19}/PKG-INFO

@@ -1,24 +1,14 @@
 Metadata-Version: 2.4
 Name: alibuild
-Version: 1.17.18
+Version: 1.17.19
 Summary: ALICE Build Tool
-Home-page: https://alisw.github.io/alibuild
-Author: Giulio Eulisse
-Author-email: Giulio Eulisse <giulio.eulisse@cern.ch>, Timo Wilken <timo.wilken@cern.ch>
-License: GPL
+Author-email: Giulio Eulisse <giulio.eulisse@cern.ch>, Timo Wilken <timo.wilken@cern.ch>, Sergio Garcia <sergio.garcia@cern.ch>
 Project-URL: homepage, https://alisw.github.io/alibuild
 Keywords: HEP,ALICE
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Build Tools
-Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
+Requires-Python: >=3.6
 Description-Content-Type: text/x-rst
 License-File: LICENSE.md
 Requires-Dist: pyyaml
@@ -26,10 +16,12 @@ Requires-Dist: requests
 Requires-Dist: distro
 Requires-Dist: jinja2
 Requires-Dist: boto3<1.36.0
-Dynamic: author
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
+Provides-Extra: test
+Requires-Dist: tox; extra == "test"
+Provides-Extra: docs
+Requires-Dist: mkdocs; extra == "docs"
+Requires-Dist: mkdocs-material; extra == "docs"
+Requires-Dist: mkdocs-redirects; extra == "docs"
 Dynamic: license-file
 
 .. image:: https://badge.fury.io/py/alibuild.svg
@@ -45,7 +37,7 @@ for the externals and ALICE software are stored in
 Instant gratification with::
 
     pip install alibuild
-    git clone https://github.com/alisw/alidist.git
+    aliBuild init
     aliBuild build AliRoot
     alienv enter AliRoot/latest
     aliroot -b
@@ -58,4 +50,29 @@ Pre-requisites
 ==============
 
 If you are using aliBuild directly from git clone, you should make sure
-you have `pyyaml` and `argparse` in your python distribution.
+you have the dependencies installed. The easiest way to do this is to run::
+
+    pip install -e .
+
+
+For developers
+==============
+
+If you want to contribute to aliBuild, you can run the tests with::
+
+    pip install -e .[test] # Only needed once
+    tox
+
+The test suite only runs fully on a Linux system, but there is a reduced suite for macOS, runnable with::
+
+    tox -e darwin
+
+You can also run only the unit tests (it's a lot faster than the full suite) with::
+
+    pytest
+
+To run the documentation locally, you can use::
+
+    pip install -e .[docs]
+    cd docs
+    mkdocs serve

{alibuild-1.17.18 → alibuild-1.17.19}/README.rst

@@ -11,7 +11,7 @@ for the externals and ALICE software are stored in
 Instant gratification with::
 
     pip install alibuild
-    git clone https://github.com/alisw/alidist.git
+    aliBuild init
     aliBuild build AliRoot
     alienv enter AliRoot/latest
     aliroot -b
@@ -24,4 +24,29 @@ Pre-requisites
 ==============
 
 If you are using aliBuild directly from git clone, you should make sure
-you have `pyyaml` and `argparse` in your python distribution.
+you have the dependencies installed. The easiest way to do this is to run::
+
+    pip install -e .
+
+
+For developers
+==============
+
+If you want to contribute to aliBuild, you can run the tests with::
+
+    pip install -e .[test] # Only needed once
+    tox
+
+The test suite only runs fully on a Linux system, but there is a reduced suite for macOS, runnable with::
+
+    tox -e darwin
+
+You can also run only the unit tests (it's a lot faster than the full suite) with::
+
+    pytest
+
+To run the documentation locally, you can use::
+
+    pip install -e .[docs]
+    cd docs
+    mkdocs serve

{alibuild-1.17.18 → alibuild-1.17.19}/alfaBuild

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-from __future__ import print_function
 import os
 import sys
 import atexit

{alibuild-1.17.18 → alibuild-1.17.19}/aliBuild

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-from __future__ import print_function
 import os
 import sys
 import atexit

{alibuild-1.17.18 → alibuild-1.17.19}/alibuild.egg-info/PKG-INFO

@@ -1,24 +1,14 @@
 Metadata-Version: 2.4
 Name: alibuild
-Version: 1.17.18
+Version: 1.17.19
 Summary: ALICE Build Tool
-Home-page: https://alisw.github.io/alibuild
-Author: Giulio Eulisse
-Author-email: Giulio Eulisse <giulio.eulisse@cern.ch>, Timo Wilken <timo.wilken@cern.ch>
-License: GPL
+Author-email: Giulio Eulisse <giulio.eulisse@cern.ch>, Timo Wilken <timo.wilken@cern.ch>, Sergio Garcia <sergio.garcia@cern.ch>
 Project-URL: homepage, https://alisw.github.io/alibuild
 Keywords: HEP,ALICE
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Build Tools
-Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
+Requires-Python: >=3.6
 Description-Content-Type: text/x-rst
 License-File: LICENSE.md
 Requires-Dist: pyyaml
@@ -26,10 +16,12 @@ Requires-Dist: requests
 Requires-Dist: distro
 Requires-Dist: jinja2
 Requires-Dist: boto3<1.36.0
-Dynamic: author
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
+Provides-Extra: test
+Requires-Dist: tox; extra == "test"
+Provides-Extra: docs
+Requires-Dist: mkdocs; extra == "docs"
+Requires-Dist: mkdocs-material; extra == "docs"
+Requires-Dist: mkdocs-redirects; extra == "docs"
 Dynamic: license-file
 
 .. image:: https://badge.fury.io/py/alibuild.svg
@@ -45,7 +37,7 @@ for the externals and ALICE software are stored in
 Instant gratification with::
 
     pip install alibuild
-    git clone https://github.com/alisw/alidist.git
+    aliBuild init
     aliBuild build AliRoot
     alienv enter AliRoot/latest
     aliroot -b
@@ -58,4 +50,29 @@ Pre-requisites
 ==============
 
 If you are using aliBuild directly from git clone, you should make sure
-you have `pyyaml` and `argparse` in your python distribution.
+you have the dependencies installed. The easiest way to do this is to run::
+
+    pip install -e .
+
+
+For developers
+==============
+
+If you want to contribute to aliBuild, you can run the tests with::
+
+    pip install -e .[test] # Only needed once
+    tox
+
+The test suite only runs fully on a Linux system, but there is a reduced suite for macOS, runnable with::
+
+    tox -e darwin
+
+You can also run only the unit tests (it's a lot faster than the full suite) with::
+
+    pytest
+
+To run the documentation locally, you can use::
+
+    pip install -e .[docs]
+    cd docs
+    mkdocs serve

{alibuild-1.17.18 → alibuild-1.17.19}/alibuild.egg-info/SOURCES.txt

@@ -4,7 +4,6 @@
 ANALYTICS.md
 DESIGN.md
 LICENSE.md
-MANIFEST.in
 PACKAGING.md
 README.rst
 alfaBuild
@@ -15,8 +14,6 @@ alienv
 codecov.yml
 pb
 pyproject.toml
-requirements.txt
-setup.py
 tox.ini
 .github/workflows/documentation.yml
 .github/workflows/pr-check.yml
@@ -88,4 +85,5 @@ tests/testdist/broken6.sh
 tests/testdist/broken7.sh
 tests/testdist/clobber-initdotsh.sh
 tests/testdist/defaults-o2.sh
-tests/testdist/delete-etc.sh
+tests/testdist/delete-etc.sh
+tests/testdist/tracking-env.sh

alibuild-1.17.19/alibuild.egg-info/requires.txt

@@ -0,0 +1,13 @@
+pyyaml
+requests
+distro
+jinja2
+boto3<1.36.0
+
+[docs]
+mkdocs
+mkdocs-material
+mkdocs-redirects
+
+[test]
+tox

alibuild-1.17.19/alibuild.egg-info/top_level.txt

@@ -0,0 +1,6 @@
+alibuild_helpers
+debian
+dist
+docs
+templates
+tests

{alibuild-1.17.18 → alibuild-1.17.19}/alibuild_helpers/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.17.18'
-__version_tuple__ = version_tuple = (1, 17, 18)
+__version__ = version = '1.17.19'
+__version_tuple__ = version_tuple = (1, 17, 19)

{alibuild-1.17.18 → alibuild-1.17.19}/alibuild_helpers/analytics.py

@@ -26,7 +26,7 @@ def askForAnalytics():
          "  https://github.com/alisw/alibuild/blob/master/ANALYTICS.md\n")
   a = input("Is that ok for you [YES/no]? ")
   if a.strip() and a.strip().lower().startswith("n"):
-    debug("User requsted disabling analytics.")
+    debug("User requested disabling analytics.")
     return disable_analytics()
   return generate_analytics_id()
 

{alibuild-1.17.18 → alibuild-1.17.19}/alibuild_helpers/build.py

@@ -22,6 +22,7 @@ from glob import glob
 from textwrap import dedent
 from collections import OrderedDict
 from shlex import quote
+import tempfile
 
 import concurrent.futures
 import importlib
@@ -183,7 +184,11 @@ def storeHashes(package, specs, considerRelocation):
     for _, _, hasher in h_alternatives:
       hasher(data)
 
-  for key in ("env", "append_path", "prepend_path"):
+  modifies_full_hash_dicts = ["env", "append_path", "prepend_path"]
+  if not spec["is_devel_pkg"] and "track_env" in spec:
+    modifies_full_hash_dicts.append("track_env")
+
+  for key in modifies_full_hash_dicts:
     if key not in spec:
       h_all("none")
     else:
@@ -265,6 +270,19 @@ def hash_local_changes(spec):
   class UntrackedChangesError(Exception):
     """Signal that we cannot detect code changes due to untracked files."""
   h = Hasher()
+  if "track_env" in spec:
+    assert isinstance(spec["track_env"], OrderedDict), \
+        "spec[%r] was of type %r" % ("track_env", type(spec["track_env"]))
+
+    # Python 3.12 changed the string representation of OrderedDicts from
+    # OrderedDict([(key, value)]) to OrderedDict({key: value}), so to remain
+    # compatible, we need to emulate the previous string representation.
+    h("OrderedDict([")
+    h(", ".join(
+        # XXX: We still rely on repr("str") being "'str'",
+        # and on repr(["a", "b"]) being "['a', 'b']".
+        "(%r, %r)" % (key, value) for key, value in spec["track_env"].items()))
+    h("])")
   def hash_output(msg, args):
     lines = msg % args
     # `git status --porcelain` indicates untracked files using "??".
@@ -391,7 +409,7 @@ def generate_initdotsh(package, specs, architecture, post_build=False):
                  if key != "DYLD_LIBRARY_PATH")
 
   # Return string without a trailing newline, since we expect call sites to
-  # append that (and the obvious way to inesrt it into the build tempate is by
+  # append that (and the obvious way to inesrt it into the build template is by
   # putting the "%(initdotsh_*)s" on its own line, which has the same effect).
   return "\n".join(lines)
 
@@ -483,7 +501,11 @@ def doBuild(args, parser):
 
   install_wrapper_script("git", workDir)
 
-  with DockerRunner(args.dockerImage, args.docker_extra_args) as getstatusoutput_docker:
+  with DockerRunner(args.dockerImage, args.docker_extra_args, extra_env={"ALIBUILD_CONFIG_DIR": "/alidist" if args.docker else os.path.abspath(args.configDir)}, extra_volumes=[f"{os.path.abspath(args.configDir)}:/alidist:ro"] if args.docker else []) as getstatusoutput_docker:
+    def performPreferCheckWithTempDir(pkg, cmd):
+      with tempfile.TemporaryDirectory(prefix=f"alibuild_prefer_check_{pkg['package']}_") as temp_dir:
+        return getstatusoutput_docker(cmd, cwd=temp_dir)
+
     systemPackages, ownPackages, failed, validDefaults = \
       getPackageList(packages                = packages,
                      specs                   = specs,
@@ -494,8 +516,8 @@ def doBuild(args, parser):
                      disable                 = args.disable,
                      force_rebuild           = args.force_rebuild,
                      defaults                = args.defaults,
-                     performPreferCheck      = lambda pkg, cmd: getstatusoutput_docker(cmd),
-                     performRequirementCheck = lambda pkg, cmd: getstatusoutput_docker(cmd),
+                     performPreferCheck      = performPreferCheckWithTempDir,
+                     performRequirementCheck = performPreferCheckWithTempDir,
                      performValidateDefaults = lambda spec: validateDefaults(spec, args.defaults),
                      overrides               = overrides,
                      taps                    = taps,
@@ -872,8 +894,18 @@ def doBuild(args, parser):
       spec["hash"] = spec["local_revision_hash"]
     else:
       spec["hash"] = spec["remote_revision_hash"]
+
+    # We do not use the override for devel packages, because we
+    # want to avoid having to rebuild things when the /tmp gets cleaned.
+    if spec["is_devel_pkg"]:
+        buildWorkDir = args.workDir
+    else:
+        buildWorkDir = os.environ.get("ALIBUILD_BUILD_WORK_DIR", args.workDir)
+
+    buildRoot = join(buildWorkDir, "BUILD", spec["hash"])
+
     spec["old_devel_hash"] = readHashFile(join(
-      workDir, "BUILD", spec["hash"], spec["package"], ".build_succeeded"))
+      buildRoot, spec["package"], ".build_succeeded"))
 
     # Recreate symlinks to this development package builds.
     if spec["is_devel_pkg"]:
@@ -881,9 +913,9 @@ def doBuild(args, parser):
       # Ignore errors here, because the path we're linking to might not exist
       # (if this is the first run through the loop). On the second run
       # through, the path should have been created by the build process.
-      call_ignoring_oserrors(symlink, spec["hash"], join(workDir, "BUILD", spec["package"] + "-latest"))
+      call_ignoring_oserrors(symlink, spec["hash"], join(buildWorkDir, "BUILD", spec["package"] + "-latest"))
       if develPrefix:
-        call_ignoring_oserrors(symlink, spec["hash"], join(workDir, "BUILD", spec["package"] + "-latest-" + develPrefix))
+        call_ignoring_oserrors(symlink, spec["hash"], join(buildWorkDir, "BUILD", spec["package"] + "-latest-" + develPrefix))
       # Last package built gets a "latest" mark.
       call_ignoring_oserrors(symlink, "{version}-{revision}".format(**spec),
                              join(workDir, args.architecture, spec["package"], "latest"))
@@ -933,7 +965,7 @@ def doBuild(args, parser):
       # assuming the package is not a development one. We also can
       # delete the SOURCES in case we have aggressive-cleanup enabled.
       if not spec["is_devel_pkg"] and args.autoCleanup:
-        cleanupDirs = [join(workDir, "BUILD", spec["hash"]),
+        cleanupDirs = [buildRoot,
                        join(workDir, "INSTALLROOT", spec["hash"])]
         if args.aggressiveCleanup:
           cleanupDirs.append(join(workDir, "SOURCES", spec["package"]))
@@ -942,13 +974,13 @@ def doBuild(args, parser):
         for d in cleanupDirs:
           shutil.rmtree(d.encode("utf8"), True)
         try:
-          unlink(join(workDir, "BUILD", spec["package"] + "-latest"))
+          unlink(join(buildWorkDir, "BUILD", spec["package"] + "-latest"))
           if "develPrefix" in args:
-            unlink(join(workDir, "BUILD", spec["package"] + "-latest-" + args.develPrefix))
+            unlink(join(buildWorkDir, "BUILD", spec["package"] + "-latest-" + args.develPrefix))
         except:
           pass
         try:
-          rmdir(join(workDir, "BUILD"))
+          rmdir(join(buildWorkDir, "BUILD"))
           rmdir(join(workDir, "INSTALLROOT"))
         except:
           pass
@@ -1035,21 +1067,26 @@ def doBuild(args, parser):
       ("FULL_RUNTIME_REQUIRES", " ".join(spec["full_runtime_requires"])),
       ("FULL_BUILD_REQUIRES", " ".join(spec["full_build_requires"])),
       ("FULL_REQUIRES", " ".join(spec["full_requires"])),
+      ("ALIBUILD_PREFER_SYSTEM_KEY", spec.get("key", "")),
     ]
     # Add the extra environment as passed from the command line.
     buildEnvironment += [e.partition('=')[::2] for e in args.environment]
 
+    # Add the computed track_env environment
+    buildEnvironment += [(key, value) for key, value in spec.get("track_env", {}).items()]
+
     # In case the --docker options is passed, we setup a docker container which
     # will perform the actual build. Otherwise build as usual using bash.
     if args.docker:
       build_command = (
         "docker run --rm --entrypoint= --user $(id -u):$(id -g) "
-        "-v {workdir}:/sw -v {scriptDir}/build.sh:/build.sh:ro "
+        "-v {workdir}:/sw -v{configDir}:/alidist:ro -v {scriptDir}/build.sh:/build.sh:ro "
         "{mirrorVolume} {develVolumes} {additionalEnv} {additionalVolumes} "
-        "-e WORK_DIR_OVERRIDE=/sw {extraArgs} {image} bash -ex /build.sh"
+        "-e WORK_DIR_OVERRIDE=/sw -e ALIBUILD_CONFIG_DIR_OVERRIDE=/alidist {extraArgs} {image} bash -ex /build.sh"
       ).format(
         image=quote(args.dockerImage),
         workdir=quote(abspath(args.workDir)),
+        configDir=quote(abspath(args.configDir)),
         scriptDir=quote(scriptDir),
         extraArgs=" ".join(map(quote, args.docker_extra_args)),
         additionalEnv=" ".join(
@@ -1095,7 +1132,7 @@ def doBuild(args, parser):
     """).format(
       h=socket.gethostname(),
       sd=scriptDir,
-      w=abspath(args.workDir),
+      w=buildWorkDir,
       p=spec["package"],
       devSuffix="-" + args.develPrefix
       if "develPrefix" in args and spec["is_devel_pkg"]
@@ -1163,7 +1200,7 @@ def doBuild(args, parser):
   for spec in specs.values():
     if spec["is_devel_pkg"]:
       banner("Build directory for devel package %s:\n%s/BUILD/%s-latest%s/%s",
-             spec["package"], abspath(args.workDir), spec["package"],
+             spec["package"], abspath(buildWorkDir), spec["package"],
              ("-" + args.develPrefix) if "develPrefix" in args else "",
              spec["package"])
   if untrackedFilesDirectories:

{alibuild-1.17.18 → alibuild-1.17.19}/alibuild_helpers/build_template.sh

@@ -11,6 +11,7 @@ set -e
 set +h
 function hash() { true; }
 export WORK_DIR="${WORK_DIR_OVERRIDE:-%(workDir)s}"
+export ALIBUILD_CONFIG_DIR="${ALIBUILD_CONFIG_DIR_OVERRIDE:-%(configDir)s}"
 
 # Insert our own wrapper scripts into $PATH, patched to use the system OpenSSL,
 # instead of the one we build ourselves.
@@ -43,16 +44,19 @@ export PKG_BUILDNUM="$PKGREVISION"
 export PKGPATH=${ARCHITECTURE}/${PKGNAME}/${PKGVERSION}-${PKGREVISION}
 mkdir -p "$WORK_DIR/BUILD" "$WORK_DIR/SOURCES" "$WORK_DIR/TARS" \
          "$WORK_DIR/SPECS" "$WORK_DIR/INSTALLROOT"
-export BUILDROOT="$WORK_DIR/BUILD/$PKGHASH"
-
 # If we are in development mode, then install directly in $WORK_DIR/$PKGPATH,
 # so that we can do "make install" directly into BUILD/$PKGPATH and have
 # changes being propagated.
+# Moreover, devel packages should always go in the official WORK_DIR
 if [ -n "$DEVEL_HASH" ]; then
+  export ALIBUILD_BUILD_WORK_DIR="${WORK_DIR}"
   export INSTALLROOT="$WORK_DIR/$PKGPATH"
 else
   export INSTALLROOT="$WORK_DIR/INSTALLROOT/$PKGHASH/$PKGPATH"
+  export ALIBUILD_BUILD_WORK_DIR="${ALIBUILD_BUILD_WORK_DIR:-$WORK_DIR}"
 fi
+
+export BUILDROOT="$ALIBUILD_BUILD_WORK_DIR/BUILD/$PKGHASH"
 export SOURCEDIR="$WORK_DIR/SOURCES/$PKGNAME/$PKGVERSION/$COMMIT_HASH"
 export BUILDDIR="$BUILDROOT/$PKGNAME"
 
@@ -99,9 +103,9 @@ unset DYLD_LIBRARY_PATH
 EOF
 
 cd "$BUILDROOT"
-ln -snf $PKGHASH $WORK_DIR/BUILD/$PKGNAME-latest
+ln -snf $PKGHASH "${BUILDROOT}-latest"
 if [[ $DEVEL_PREFIX ]]; then
-  ln -snf $PKGHASH $WORK_DIR/BUILD/$PKGNAME-latest-$DEVEL_PREFIX
+  ln -snf $PKGHASH "${BUILDROOT}-latest-$DEVEL_PREFIX"
 fi
 
 cd "$BUILDDIR"

{alibuild-1.17.18 → alibuild-1.17.19}/alibuild_helpers/cmd.py

@@ -37,9 +37,9 @@ def getoutput(command, timeout=None):
   return decode_with_fallback(stdout)
 
 
-def getstatusoutput(command, timeout=None):
+def getstatusoutput(command, timeout=None, cwd=None):
   """Run command and return its return code and output (stdout and stderr)."""
-  proc = Popen(command, shell=isinstance(command, str), stdout=PIPE, stderr=STDOUT)
+  proc = Popen(command, shell=isinstance(command, str), stdout=PIPE, stderr=STDOUT, cwd=cwd)
   try:
     merged_output, _ = proc.communicate(timeout=timeout)
   except TimeoutExpired:
@@ -78,24 +78,42 @@ class DockerRunner:
   instead.
   """
 
-  def __init__(self, docker_image, docker_run_args=()) -> None:
+  def __init__(self, docker_image, docker_run_args=(), extra_env={}, extra_volumes=[]) -> None:
     self._docker_image = docker_image
     self._docker_run_args = docker_run_args
     self._container = None
+    self._extra_env = extra_env
+    self._extra_volumes = extra_volumes
 
   def __enter__(self):
     if self._docker_image:
       # "sleep inf" pauses forever, until we kill it.
-      cmd = ["docker", "run", "--detach", "--rm", "--entrypoint="]
+      envOpts = []
+      volumes = []
+      for env in self._extra_env.items():
+        envOpts.append("-e")
+        envOpts.append(f"{env[0]}={env[1]}")
+      for v in self._extra_volumes:
+        volumes.append("-v")
+        volumes.append(v)
+      cmd = ["docker", "run", "--detach"] + envOpts + volumes + ["--rm", "--entrypoint="]
       cmd += self._docker_run_args
       cmd += [self._docker_image, "sleep", "inf"]
       self._container = getoutput(cmd).strip()
 
-    def getstatusoutput_docker(cmd):
+    def getstatusoutput_docker(cmd, cwd=None):
       if self._container is None:
-        return getstatusoutput("{} -c {}".format(BASH, quote(cmd)))
-      return getstatusoutput("docker container exec {} bash -c {}"
-                             .format(quote(self._container), quote(cmd)))
+        command_prefix=""
+        if self._extra_env:
+          command_prefix="env " + " ".join("{}={}".format(k, v) for (k,v) in self._extra_env.items()) + " "
+        return getstatusoutput("{}{} -c {}".format(command_prefix, BASH, quote(cmd))
+                             , cwd=cwd)
+      envOpts = []
+      for env in self._extra_env.items():
+        envOpts.append("-e")
+        envOpts.append("{}={}".format(env[0], env[1]))
+      exec_cmd = ["docker", "container", "exec"] + envOpts + [self._container, "bash", "-c", cmd]
+      return getstatusoutput(exec_cmd, cwd=cwd)
 
     return getstatusoutput_docker