alibuild 1.17.19__py3-none-any.whl → 1.17.33__py3-none-any.whl

docs/docs/troubleshooting.md

@@ -76,8 +76,9 @@ will tell you something like:
     We will build packages in the following order: defaults-release AliEn-CAs GMP UUID gSOAP ApMon-CPP GEANT4 boost MPFR MonALISA-gSOAP-client cgal XRootD fastjet xalienfs AliEn-Runtime ROOT vgm GEANT3 GEANT4_VMC AliRoot
 
 If you have a system package which you think should be used but it's not, you
-can run `aliDoctor <package-name>` to try to understand why that was the case
-(or you can [open a bug report](https://github.com/alisw/alidist/issues) with its output and we will look at it).
+can run `aliBuild doctor <package-name>` to try to understand why that was the
+case (or you can [open a bug report](https://github.com/alisw/alidist/issues)
+with its output and we will look at it).
 
 ### What is PIP ? How do I install it?
 
@@ -155,7 +156,7 @@ it means that aliBuild does not consider you system tool good enough to
 be compatible with the one provided by the recipe. You can verify what
 happens during the system tool detection by running:
 
-    aliDoctor <package name>
+    aliBuild doctor <package name>
 
 
 ### AliBuild fails with `cannot open file "AvailabilityMacros.h`
@@ -236,7 +237,7 @@ building unless one of the system dependencies is absolutely required
 tool, where simply installing them might be a better option. For this
 reason we suggest that users run:
 
-    aliDoctor AliPhysics
+    aliBuild doctor AliPhysics
 
 in the same path where their `alidist` folder is, before actually
 starting to build, so that they can get an overview of what will be

docs/docs/user.md

@@ -11,7 +11,9 @@ For a quick start introduction, please look [here](quick.md).
 aliBuild build [-h] [--defaults DEFAULT]
                [-a ARCH] [--force-unknown-architecture]
                [-z [DEVELPREFIX]] [-e ENVIRONMENT] [-j JOBS] [-u]
-               [--no-local PKGLIST] [--disable PACKAGE]
+               [--no-local PKGLIST] [--force-tracked] [--disable PACKAGE]
+               [--force-rebuild PACKAGE] [--annotate PACKAGE=COMMENT]
+               [--only-deps] [--plugin PLUGIN]
                [--always-prefer-system | --no-system]
                [--docker] [--docker-image IMAGE] [--docker-extra-args ARGLIST] [-v VOLUMES]
                [--no-remote-store] [--remote-store STORE] [--write-store STORE] [--insecure] 
@@ -39,7 +41,18 @@ aliBuild build [-h] [--defaults DEFAULT]
   given.
 - `--no-local PKGLIST`: Do not pick up the following packages from a local
   checkout. `PKGLIST` is a comma-separated list.
+- `--force-tracked`: Do not pick up any packages from a local checkout.
 - `--disable PACKAGE`: Do not build `PACKAGE` and all its (unique) dependencies.
+- `--force-rebuild PACKAGE`: Always rebuild the specified packages from scratch,
+  even if they were built before. Has the same effect as adding
+  `force_rebuild: true` to the recipe. May be specified multiple times or
+  separate multiple arguments with commas.
+- `--annotate PACKAGE=COMMENT`: Store `COMMENT` in the build metadata for
+  `PACKAGE`. The comment will only be stored if the package is compiled or
+  downloaded during this run. May be specified multiple times.
+- `--only-deps`: Only build dependencies, not the main package. Useful for
+  populating a build cache.
+- `--plugin PLUGIN`: Plugin to use for the build. Default is `legacy`.
 - `--always-prefer-system`: Always use system packages when compatible.
 - `--no-system`: Never use system packages, even if compatible.
 
@@ -102,8 +115,8 @@ provides tarballs for the most common supported architectures.
 
 ## Using precompiled packages
 
-By running aliBuild with no special option on CentOS/Alma 7, 8 or 9, or on
-Ubuntu 20.04, 22.04 or 24.04, it will automatically try to
+By running aliBuild with no special option on CentOS/Alma 7, 8 or 9 (x86-64 or ARM),
+or on Ubuntu 20.04, 22.04 or 24.04 (x86-64), it will automatically try to
 use as many precompiled packages as possible by downloading them from a default
 central server. By using precompiled packages you lose the ability to pick some
 of them from your system. If you do not want to use precompiled packages and you
@@ -199,16 +212,30 @@ case the incremental recipe will always be executed.
 
 While alibuild does its best to find out which OS / distribution you are
 using, sometimes it might fail to do so, for example in the case you
-start using a new *buntu flavour or a bleeding edge version of Centos.
-In order to force the the correct architecture for the build you can use
+start using a new *buntu flavour or a bleeding edge version of a distribution.
+In order to force the correct architecture for the build you can use
 the `--architecture` (`-a`) flag with one of the supported options:
 
-- `slc5_x86-64`: Scientific Linux 5 and compatibles, on Intel / AMD x86-64.
-- `slc6_x86-64`: Scientific Linux 6 and compatibles, on Intel / AMD x86-64.
-- `slc7_x86-64`: CERN Centos 7 and compatibles, on Intel / AMD x86-64.
-- `ubuntu1404_x86-64`: Ubuntu 1404 and compatibles, on Intel / AMD x86-64.
-- `osx_x86-64`: OSX, on Intel / AMD x86-64.
-- `slc7_ppc64`: RHEL7 on POWER8 (LE only for now).
+On Linux, x86-64:
+- `slc6_x86-64`: RHEL6 / SLC6 compatible
+- `slc7_x86-64`: RHEL7 / CC7 compatible
+- `slc8_x86-64`: RHEL8 / CC8 compatible
+- `slc9_x86-64`: RHEL9 / ALMA9 compatible
+- `ubuntu2004_x86-64`: Ubuntu 20.04 compatible
+- `ubuntu2204_x86-64`: Ubuntu 22.04 compatible
+- `ubuntu2404_x86-64`: Ubuntu 24.04 compatible
+- `fedora33_x86-64`: Fedora 33 compatible
+- `fedora34_x86-64`: Fedora 34 compatible
+
+On Linux, ARM:
+- `slc9_aarch64`: RHEL9 / ALMA9 compatible
+
+On Linux, POWER8 / PPC64 (little endian):
+- `slc7_ppc64`: RHEL7 / CC7 compatible
+
+On Mac:
+- `osx_x86-64`: Intel
+- `osx_arm64`: Apple Silicon
 
 ### Running in Docker
 
@@ -234,27 +261,33 @@ option using the same syntax used by Docker.
 
 ## Defaults
 
-By default `aliBuild` is tuned to build the production version of ALICE
-Offline software, as deployed on the Grid, so some of the choices in
-terms of version of the packages and compilation flags are tweaked for
-that. For example, ROOT5 is used because that's what is what has been
-validated for datataking and the choice will not change until the end of
-RUN2 of LHC. In order to change that and use, for example, a more recent
-version of ROOT you can use the `--default root6` option which will
-enable ROOT6 based builds. For a more complete description of how defaults
-works please look at [the reference manual](reference.md#defaults).
+By default, `aliBuild` uses the `o2` defaults (`--defaults o2`), which are
+optimized for building the ALICE O2 software stack. The defaults system
+allows you to specify different sets of build configurations, compiler
+flags, and package versions through the `--defaults` option.
+
+Different defaults can be used to:
+- Use different package versions (e.g., different ROOT versions)
+- Apply specific compiler flags (e.g., debug builds, optimization levels)
+- Enable or disable certain features or packages
+
+To use a different set of defaults, use the `--defaults <name>` option,
+which will load settings from `CONFIGDIR/defaults-<name>.sh`. For example,
+`--defaults o2-epn` would use the `defaults-o2-epn.sh` file.
+
+For a more complete description of how the defaults system works and how to
+create custom defaults, please look at [the reference manual](reference.md#defaults).
 
 ## Disabling packages
 
 You can optionally disable certain packages by specifying them as a comma
 separated list with the `--disable` option.
 
-Moreover, starting from aliBuild 1.4.0, it will also be
-possible to disable packages by adding them to the `disable`
-keyword of your defaults file (see previous paragraph). See the
+It's also possible to disable packages by adding them to the `disable` keyword
+of your defaults file (see previous paragraph). See the
 [defaults-o2.sh](https://github.com/alisw/alidist/blob/master/defaults-o2.sh)
-file for an example of how to disable `AliEn-Runtime` and `AliRoot`
-when passing `--defaults o2`.
+file for an example of how to disable `mesos` and `MySQL` when
+passing `--defaults o2`.
 
 ## Controlling which system packages are picked up
 
@@ -294,15 +327,12 @@ installation area.
 
 ## Upgrading aliBuild
 
-aliBuild is installed via `pip`. In order to upgrade it on most laptops (in
-particular Macs) do:
+aliBuild can be installed either via `pip`, or by your OS package manager (more info [here](https://alice-doc.github.io/alice-analysis-tutorial/building/custom.html). 
 
-    pip install --upgrade alibuild
+The way to upgrade it depends on your installation method. If you installed it
+via `pip`, you can upgrade it by running:
 
-or in case you need to be root (_e.g._ on Ubuntu and most Linux distributions
-for convenience):
-
-    sudo pip install --upgrade alibuild
+    pip install --upgrade alibuild
 
 In general updating aliBuild is safe and it should never trigger a rebuild or
 break compilation of older versions of alidist (i.e. we do try to guarantee
@@ -315,10 +345,8 @@ when running the command.
 You can also upgrade / install a specific version of alibuild by specifying it on the 
 command line. E.g.:
 
-    pip install alibuild=1.5.5.rc1
+    pip install alibuild=1.17.23
     
-this is in particular required when you want to try out release candidates (rc) builds which
-are masked out by default.
 
 ## Rebuilding packages from branches instead of tags
 
@@ -339,11 +367,11 @@ server-side pull request checks).
 
 ## Generating a dependency graph
 
-It is possible to generating a PDF with a dependency graph using the `aliDeps`
+It is possible to generating a PDF with a dependency graph using the `aliBuild deps`
 tool. Assuming you run it from a directory containing `alidist`, and you have
 Graphviz installed on your system, you can simply run:
 
-    aliDeps O2 --outgraph graph.pdf
+    aliBuild deps O2 --outgraph graph.pdf
 
 The example above generates a dependency graph for the package `O2`, and saving
 the results to a PDF file named `graph.pdf`. This is what the graph looks like:
@@ -357,13 +385,25 @@ others (this can indicate an error in the recipes).
 Connections are color-coded as well: blue connections indicate a runtime
 dependency whereas a grey connection indicate a build dependency.
 
-By default, `aliDeps` runs the usual system checks to exclude packages that can
+By default, `aliBuild deps` runs the usual system checks to exclude packages that can
 be taken from the system. If you want to display the full list of dependencies,
 you may want to use:
 
-    aliDeps O2 --no-system --outgraph graph.pdf
+    aliBuild deps O2 --no-system --outgraph graph.pdf
+
+Additional useful options for `aliBuild deps` include:
+
+- `--neat`: Produce a graph with transitive reduction, removing edges that are
+  implied by other paths in the graph. This can make complex dependency graphs
+  easier to read.
+- `--outdot FILE`: Keep the intermediate Graphviz dot file in `FILE`. Useful if
+  you want to manually modify the graph or generate output in different formats.
+
+For example, to generate a simplified graph and keep the dot file:
+
+    aliBuild deps O2 --neat --outdot graph.dot --outgraph graph.pdf
 
-Please run `aliDeps --help` for further information.
+Please run `aliBuild deps --help` for further information.
 
 ## Using the packages you have built
 

tests/test_build.py

@@ -1,6 +1,7 @@
 from argparse import Namespace
 import os
 import os.path
+import platform
 import re
 import sys
 import unittest
@@ -12,6 +13,19 @@ from collections import OrderedDict
 from alibuild_helpers.utilities import parseRecipe, resolve_tag
 from alibuild_helpers.build import doBuild, storeHashes, generate_initdotsh
 
+# Determine architecture based on platform
+def get_test_architecture():
+    if sys.platform == 'darwin':
+        machine = platform.machine()
+        if machine == 'arm64':
+            return 'osx_arm64'
+        else:
+            return 'osx_x86-64'
+    else:
+        return 'slc7_x86-64'
+
+TEST_ARCHITECTURE = os.environ.get('ARCHITECTURE', get_test_architecture())
+
 
 TEST_DEFAULT_RELEASE = """\
 package: defaults-release
@@ -23,7 +37,7 @@ TEST_DEFAULT_RELEASE_BUILD_HASH = "27ce49698e818e8efb56b6eff6dd785e503df341"
 
 TEST_ZLIB_RECIPE = """\
 package: zlib
-version: v1.2.3
+version: v1.3.1
 source: https://github.com/madler/zlib
 tag: master
 ---
@@ -32,7 +46,7 @@ make
 make install
 """
 TEST_ZLIB_GIT_REFS = "8822efa61f2a385e0bc83ca5819d608111b2168a\trefs/heads/master"
-TEST_ZLIB_BUILD_HASH = "8cd1f56c450f05ffbba3276bad08eae30f814999"
+TEST_ZLIB_BUILD_HASH = "4d6a75f214dc7931a2a7d5ba82ea0568e652cd84"
 
 TEST_ROOT_RECIPE = """\
 package: ROOT
@@ -71,7 +85,7 @@ TEST_ROOT_GIT_REFS = """\
 87b87c4322d2a3fad315c919cb2e2dd73f2154dc\trefs/heads/master
 f7b336611753f1f4aaa94222b0d620748ae230c0\trefs/heads/v6-08-00-patches
 f7b336611753f1f4aaa94222b0d620748ae230c0\trefs/tags/test-tag"""
-TEST_ROOT_BUILD_HASH = ("8ec3f41b6b585ef86a02e9c595eed67f34d63f08")
+TEST_ROOT_BUILD_HASH = ("1f3c771080f71b6c0d2e3d7a285698a20035da12")
 
 
 TEST_EXTRA_RECIPE = """\
@@ -88,20 +102,20 @@ f000\trefs/heads/master
 ba22\trefs/tags/v1
 ba22\trefs/tags/v2
 baad\trefs/tags/v3"""
-TEST_EXTRA_BUILD_HASH = ("5afae57bfc6a374e74c1c4427698ab5edebce0bc")
+TEST_EXTRA_BUILD_HASH = ("6e7bc4976abf77b558cf7faf575ec51670f8d0e5")
 
 
 GIT_CLONE_REF_ZLIB_ARGS = ("clone", "--bare", "https://github.com/madler/zlib",
                            "/sw/MIRROR/zlib", "--filter=blob:none"), ".", False
 GIT_CLONE_SRC_ZLIB_ARGS = ("clone", "-n", "https://github.com/madler/zlib",
-                           "/sw/SOURCES/zlib/v1.2.3/8822efa61f",
+                           "/sw/SOURCES/zlib/v1.3.1/8822efa61f",
                            "--dissociate", "--reference", "/sw/MIRROR/zlib", "--filter=blob:none"), ".", False
 GIT_SET_URL_ZLIB_ARGS = ("remote", "set-url", "--push", "origin", "https://github.com/madler/zlib"), \
-    "/sw/SOURCES/zlib/v1.2.3/8822efa61f", False
+    "/sw/SOURCES/zlib/v1.3.1/8822efa61f", False
 GIT_CHECKOUT_ZLIB_ARGS = ("checkout", "-f", "master"), \
-    "/sw/SOURCES/zlib/v1.2.3/8822efa61f", False
+    "/sw/SOURCES/zlib/v1.3.1/8822efa61f", False
 
-GIT_FETCH_REF_ROOT_ARGS = ("fetch", "-f", "--filter=blob:none", "https://github.com/root-mirror/root", "+refs/tags/*:refs/tags/*",
+GIT_FETCH_REF_ROOT_ARGS = ("fetch", "-f", "--prune", "--filter=blob:none", "https://github.com/root-mirror/root", "+refs/tags/*:refs/tags/*",
                            "+refs/heads/*:refs/heads/*"), "/sw/MIRROR/root", False
 GIT_CLONE_SRC_ROOT_ARGS = ("clone", "-n", "https://github.com/root-mirror/root",
                            "/sw/SOURCES/ROOT/v6-08-30/f7b3366117",
@@ -143,9 +157,9 @@ def dummy_open(x, mode="r", encoding=None, errors=None):
                 "/sw/BUILD/%s/defaults-release/.build_succeeded" % TEST_DEFAULT_RELEASE_BUILD_HASH: (0, StringIO("0")),
                 "/sw/BUILD/%s/zlib/.build_succeeded" % TEST_ZLIB_BUILD_HASH: (0, StringIO("0")),
                 "/sw/BUILD/%s/ROOT/.build_succeeded" % TEST_ROOT_BUILD_HASH: (0, StringIO("0")),
-                "/sw/osx_x86-64/defaults-release/v1-1/.build-hash": (1, StringIO(TEST_DEFAULT_RELEASE_BUILD_HASH)),
-                "/sw/osx_x86-64/zlib/v1.2.3-local1/.build-hash": (1, StringIO(TEST_ZLIB_BUILD_HASH)),
-                "/sw/osx_x86-64/ROOT/v6-08-30-local1/.build-hash": (1, StringIO(TEST_ROOT_BUILD_HASH))
+                f"/sw/{TEST_ARCHITECTURE}/defaults-release/v1-1/.build-hash": (1, StringIO(TEST_DEFAULT_RELEASE_BUILD_HASH)),
+                f"/sw/{TEST_ARCHITECTURE}/zlib/v1.3.1-local1/.build-hash": (1, StringIO(TEST_ZLIB_BUILD_HASH)),
+                f"/sw/{TEST_ARCHITECTURE}/ROOT/v6-08-30-local1/.build-hash": (1, StringIO(TEST_ROOT_BUILD_HASH))
             }[x]
         except KeyError:
             return DEFAULT
@@ -163,17 +177,16 @@ def dummy_execute(x, **kwds):
     if re.match(".*ln -sfn.*TARS", s):
         return 0
     return {
-        "/bin/bash -e -x /sw/SPECS/osx_x86-64/defaults-release/v1-1/build.sh 2>&1": 0,
-        '/bin/bash -e -x /sw/SPECS/osx_x86-64/zlib/v1.2.3-local1/build.sh 2>&1': 0,
-        '/bin/bash -e -x /sw/SPECS/osx_x86-64/ROOT/v6-08-30-local1/build.sh 2>&1': 0,
+        f"/bin/bash -e -x /sw/SPECS/{TEST_ARCHITECTURE}/defaults-release/v1-1/build.sh 2>&1": 0,
+        f'/bin/bash -e -x /sw/SPECS/{TEST_ARCHITECTURE}/zlib/v1.3.1-local1/build.sh 2>&1': 0,
+        f'/bin/bash -e -x /sw/SPECS/{TEST_ARCHITECTURE}/ROOT/v6-08-30-local1/build.sh 2>&1': 0,
     }[s]
 
 
 def dummy_readlink(x):
     return {
-        "/sw/TARS/osx_x86-64/defaults-release/defaults-release-v1-1.osx_x86-64.tar.gz":
-        "../../osx_x86-64/store/%s/%s/defaults-release-v1-1.osx_x86-64.tar.gz" %
-        (TEST_DEFAULT_RELEASE_BUILD_HASH[:2], TEST_DEFAULT_RELEASE_BUILD_HASH)
+        f"/sw/TARS/{TEST_ARCHITECTURE}/defaults-release/defaults-release-v1-1.{TEST_ARCHITECTURE}.tar.gz":
+        f"../../{TEST_ARCHITECTURE}/store/{TEST_DEFAULT_RELEASE_BUILD_HASH[:2]}/{TEST_DEFAULT_RELEASE_BUILD_HASH}/defaults-release-v1-1.{TEST_ARCHITECTURE}.tar.gz"
     }[x]
 
 
@@ -224,13 +237,11 @@ class BuildTestCase(unittest.TestCase):
     @patch("os.listdir")
     @patch("alibuild_helpers.build.glob", new=lambda pattern: {
         "*": ["zlib"],
-        "/sw/TARS/osx_x86-64/store/%s/%s/*gz" % (TEST_DEFAULT_RELEASE_BUILD_HASH[:2],
-                                                 TEST_DEFAULT_RELEASE_BUILD_HASH): [],
-        "/sw/TARS/osx_x86-64/store/%s/%s/*gz" % (TEST_ZLIB_BUILD_HASH[:2], TEST_ZLIB_BUILD_HASH): [],
-        "/sw/TARS/osx_x86-64/store/%s/%s/*gz" % (TEST_ROOT_BUILD_HASH[:2], TEST_ROOT_BUILD_HASH): [],
-        "/sw/TARS/osx_x86-64/defaults-release/defaults-release-v1-1.osx_x86-64.tar.gz":
-        ["../../osx_x86-64/store/%s/%s/defaults-release-v1-1.osx_x86-64.tar.gz" %
-         (TEST_DEFAULT_RELEASE_BUILD_HASH[:2], TEST_DEFAULT_RELEASE_BUILD_HASH)],
+        f"/sw/TARS/{TEST_ARCHITECTURE}/store/{TEST_DEFAULT_RELEASE_BUILD_HASH[:2]}/{TEST_DEFAULT_RELEASE_BUILD_HASH}/*gz": [],
+        f"/sw/TARS/{TEST_ARCHITECTURE}/store/{TEST_ZLIB_BUILD_HASH[:2]}/{TEST_ZLIB_BUILD_HASH}/*gz": [],
+        f"/sw/TARS/{TEST_ARCHITECTURE}/store/{TEST_ROOT_BUILD_HASH[:2]}/{TEST_ROOT_BUILD_HASH}/*gz": [],
+        f"/sw/TARS/{TEST_ARCHITECTURE}/defaults-release/defaults-release-v1-1.{TEST_ARCHITECTURE}.tar.gz":
+        [f"../../{TEST_ARCHITECTURE}/store/{TEST_DEFAULT_RELEASE_BUILD_HASH[:2]}/{TEST_DEFAULT_RELEASE_BUILD_HASH}/defaults-release-v1-1.{TEST_ARCHITECTURE}.tar.gz"],
     }[pattern])
     @patch("alibuild_helpers.build.readlink", new=dummy_readlink)
     @patch("alibuild_helpers.build.banner", new=MagicMock(return_value=None))
@@ -243,9 +254,9 @@ class BuildTestCase(unittest.TestCase):
         mock_debug.side_effect = lambda *args: None
         mock_warning.side_effect = lambda *args: None
         mock_listdir.side_effect = lambda directory: {
-            "/sw/TARS/osx_x86-64/defaults-release": ["defaults-release-v1-1.osx_x86-64.tar.gz"],
-            "/sw/TARS/osx_x86-64/zlib": [],
-            "/sw/TARS/osx_x86-64/ROOT": [],
+            f"/sw/TARS/{TEST_ARCHITECTURE}/defaults-release": [f"defaults-release-v1-1.{TEST_ARCHITECTURE}.tar.gz"],
+            f"/sw/TARS/{TEST_ARCHITECTURE}/zlib": [],
+            f"/sw/TARS/{TEST_ARCHITECTURE}/ROOT": [],
         }.get(directory, DEFAULT)
         os.environ["ALIBUILD_NO_ANALYTICS"] = "1"
 
@@ -257,7 +268,7 @@ class BuildTestCase(unittest.TestCase):
             docker=False,
             dockerImage=None,
             docker_extra_args=["--network=host"],
-            architecture="osx_x86-64",
+            architecture=TEST_ARCHITECTURE,
             workDir="/sw",
             pkgname=["root"],
             configDir="/alidist",
@@ -271,7 +282,7 @@ class BuildTestCase(unittest.TestCase):
             debug=True,
             dryRun=False,
             aggressiveCleanup=False,
-            environment={},
+            environment=[],
             autoCleanup=False,
             noDevel=[],
             onlyDeps=False,
@@ -319,7 +330,7 @@ class BuildTestCase(unittest.TestCase):
         doBuild(args, mock_parser)
         mock_warning.assert_called_with("%s.sh contains a recipe, which will be ignored", "defaults-release")
         mock_debug.assert_called_with("Everything done")
-        mock_listdir.assert_called_with("/sw/TARS/osx_x86-64/ROOT")
+        mock_listdir.assert_called_with(f"/sw/TARS/{TEST_ARCHITECTURE}/ROOT")
         # We can't compare directly against the list of calls here as they
         # might happen in any order.
         mock_git_git.assert_has_calls(common_calls + [
@@ -406,8 +417,8 @@ class BuildTestCase(unittest.TestCase):
         self.assertNotIn("Extra", complete_initdotsh)
 
         # Dependencies must be loaded both for this build and for subsequent ones.
-        self.assertIn('. "$WORK_DIR/$ALIBUILD_ARCH_PREFIX"/zlib/v1.2.3-1/etc/profile.d/init.sh', setup_initdotsh)
-        self.assertIn('. "$WORK_DIR/$ALIBUILD_ARCH_PREFIX"/zlib/v1.2.3-1/etc/profile.d/init.sh', complete_initdotsh)
+        self.assertIn('. "$WORK_DIR/$ALIBUILD_ARCH_PREFIX"/zlib/v1.3.1-1/etc/profile.d/init.sh', setup_initdotsh)
+        self.assertIn('. "$WORK_DIR/$ALIBUILD_ARCH_PREFIX"/zlib/v1.3.1-1/etc/profile.d/init.sh', complete_initdotsh)
 
         # ROOT-specific variables must not be set during ROOT's build yet...
         self.assertNotIn("export ROOT_VERSION=", setup_initdotsh)

tests/test_cmd.py

@@ -68,6 +68,28 @@ class CmdTestCase(unittest.TestCase):
             getstatusoutput_docker("echo test")
             mock_getstatusoutput.assert_called_with("env TEST_VAR=test_value ANOTHER_VAR=another_value /bin/bash -c 'echo test'", cwd=None)
 
+    @mock.patch("alibuild_helpers.cmd.getoutput")
+    @mock.patch("alibuild_helpers.cmd.getstatusoutput")
+    def test_DockerRunner_multiline_env_var(self, mock_getstatusoutput, mock_getoutput):
+        multiline_value = "line1\nline2\nline3"
+        extra_env = {"MULTILINE_VAR": multiline_value}
+        
+        with DockerRunner("", extra_env=extra_env) as getstatusoutput_docker:
+            mock_getoutput.assert_not_called()
+            getstatusoutput_docker("echo test")
+            mock_getstatusoutput.assert_called_with("env MULTILINE_VAR='line1\nline2\nline3' /bin/bash -c 'echo test'", cwd=None)
+
+    @mock.patch("alibuild_helpers.cmd.getoutput")
+    @mock.patch("alibuild_helpers.cmd.getstatusoutput")
+    def test_DockerRunner_env_var_with_semicolon(self, mock_getstatusoutput, mock_getoutput):
+        semicolon_value = "value1;value2;value3"
+        extra_env = {"SEMICOLON_VAR": semicolon_value}
+        
+        with DockerRunner("", extra_env=extra_env) as getstatusoutput_docker:
+            mock_getoutput.assert_not_called()
+            getstatusoutput_docker("echo test")
+            mock_getstatusoutput.assert_called_with("env SEMICOLON_VAR='value1;value2;value3' /bin/bash -c 'echo test'", cwd=None)
+
 
 if __name__ == '__main__':
     unittest.main()

tests/test_deps.py

@@ -64,7 +64,8 @@ class DepsTestCase(unittest.TestCase):
                          outdot="/tmp/out.dot",
                          outgraph="/tmp/outgraph.pdf",
                          package="AliRoot",
-                         defaults="release")
+                         defaults="release",
+                         environment=[])
         def fake_exists(n):
             return {"/alidist/aliroot.sh": True}
         with patch.object(os.path, "exists", fake_exists):

tests/test_doctor.py

@@ -82,7 +82,8 @@ class DoctorTestCase(unittest.TestCase):
                      noSystem="*",
                      architecture="osx_x86-64",
                      disable=[],
-                     defaults="release")
+                     defaults="release",
+                     environment=[])
 
     def fake_exists(n):
         return {"/alidist/aliroot.sh": True}

tests/test_init.py

@@ -48,7 +48,8 @@ class InitTestCase(unittest.TestCase):
         defaults = "release",
         dryRun = True,
         fetchRepos = False,
-        architecture = "slc7_x86-64"
+        architecture = "slc7_x86-64",
+        environment = {},
       )
       self.assertRaises(SystemExit, doInit, args)
       self.assertEqual(mock_info.mock_calls, [call('This will initialise local checkouts for %s\n--dry-run / -n specified. Doing nothing.', 'zlib,AliRoot')])
@@ -81,7 +82,8 @@ class InitTestCase(unittest.TestCase):
         defaults = "release",
         dryRun = False,
         fetchRepos = False,
-        architecture = "slc7_x86-64"
+        architecture = "slc7_x86-64",
+        environment = {},
       )
       def fake_exists(n):
           return {"/alidist/aliroot.sh": True}

tests/test_sync.py

@@ -16,19 +16,19 @@ GOOD_HASH = "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef"
 BAD_HASH = "baadf00dbaadf00dbaadf00dbaadf00dbaadf00d"
 NONEXISTENT_HASH = "TRIGGERS_A_404"
 GOOD_SPEC = {    # fully present on the remote store
-    "package": PACKAGE, "version": "v1.2.3", "revision": "1",
+    "package": PACKAGE, "version": "v1.3.1", "revision": "1",
     "hash": GOOD_HASH,
     "remote_revision_hash": GOOD_HASH,
     "remote_hashes": [GOOD_HASH],
 }
 BAD_SPEC = {     # partially present on the remote store
-    "package": PACKAGE, "version": "v1.2.3", "revision": "2",
+    "package": PACKAGE, "version": "v1.3.1", "revision": "2",
     "hash": BAD_HASH,
     "remote_revision_hash": BAD_HASH,
     "remote_hashes": [BAD_HASH],
 }
 MISSING_SPEC = {    # completely absent from the remote store
-    "package": PACKAGE, "version": "v1.2.3", "revision": "3",
+    "package": PACKAGE, "version": "v1.3.1", "revision": "3",
     "hash": NONEXISTENT_HASH,
     "remote_revision_hash": NONEXISTENT_HASH,
     "remote_hashes": [NONEXISTENT_HASH],

tests/test_utilities.py

@@ -113,12 +113,102 @@ SUPPORT_URL="http://forum.sabayon.org/"
 BUG_REPORT_URL="https://bugs.sabayon.org/"
 """
 
+ALMA_8_OS_RELEASE = """
+NAME="AlmaLinux"
+VERSION="8.10 (Cerulean Leopard)"
+ID="almalinux"
+ID_LIKE="rhel centos fedora"
+VERSION_ID="8.10"
+PLATFORM_ID="platform:el8"
+PRETTY_NAME="AlmaLinux 8.10 (Cerulean Leopard)"
+ANSI_COLOR="0;34"
+LOGO="fedora-logo-icon"
+CPE_NAME="cpe:/o:almalinux:almalinux:8::baseos"
+HOME_URL="https://almalinux.org/"
+DOCUMENTATION_URL="https://wiki.almalinux.org/"
+BUG_REPORT_URL="https://bugs.almalinux.org/"
+
+ALMALINUX_MANTISBT_PROJECT="AlmaLinux-8"
+ALMALINUX_MANTISBT_PROJECT_VERSION="8.10"
+REDHAT_SUPPORT_PRODUCT="AlmaLinux"
+REDHAT_SUPPORT_PRODUCT_VERSION="8.10"
+SUPPORT_END=2029-06-01
+"""
+
+ALMA_9_OS_RELEASE = """
+NAME="AlmaLinux"
+VERSION="9.6 (Sage Margay)"
+ID="almalinux"
+ID_LIKE="rhel centos fedora"
+VERSION_ID="9.6"
+PLATFORM_ID="platform:el9"
+PRETTY_NAME="AlmaLinux 9.6 (Sage Margay)"
+ANSI_COLOR="0;34"
+LOGO="fedora-logo-icon"
+CPE_NAME="cpe:/o:almalinux:almalinux:9::baseos"
+HOME_URL="https://almalinux.org/"
+DOCUMENTATION_URL="https://wiki.almalinux.org/"
+BUG_REPORT_URL="https://bugs.almalinux.org/"
+
+ALMALINUX_MANTISBT_PROJECT="AlmaLinux-9"
+ALMALINUX_MANTISBT_PROJECT_VERSION="9.6"
+REDHAT_SUPPORT_PRODUCT="AlmaLinux"
+REDHAT_SUPPORT_PRODUCT_VERSION="9.6"
+SUPPORT_END=2032-06-01
+"""
+
+ROCKY_8_OS_RELEASE = """
+NAME="Rocky Linux"
+VERSION="8.10 (Green Obsidian)"
+ID="rocky"
+ID_LIKE="rhel centos fedora"
+VERSION_ID="8.10"
+PLATFORM_ID="platform:el8"
+PRETTY_NAME="Rocky Linux 8.10 (Green Obsidian)"
+ANSI_COLOR="0;32"
+LOGO="fedora-logo-icon"
+CPE_NAME="cpe:/o:rocky:rocky:8:GA"
+HOME_URL="https://rockylinux.org/"
+BUG_REPORT_URL="https://bugs.rockylinux.org/"
+SUPPORT_END="2029-05-31"
+ROCKY_SUPPORT_PRODUCT="Rocky-Linux-8"
+ROCKY_SUPPORT_PRODUCT_VERSION="8.10"
+REDHAT_SUPPORT_PRODUCT="Rocky Linux"
+REDHAT_SUPPORT_PRODUCT_VERSION="8.10"
+"""
+
+ROCKY_9_OS_RELEASE = """
+NAME="Rocky Linux"
+VERSION="9.6 (Blue Onyx)"
+ID="rocky"
+ID_LIKE="rhel centos fedora"
+VERSION_ID="9.6"
+PLATFORM_ID="platform:el9"
+PRETTY_NAME="Rocky Linux 9.6 (Blue Onyx)"
+ANSI_COLOR="0;32"
+LOGO="fedora-logo-icon"
+CPE_NAME="cpe:/o:rocky:rocky:9::baseos"
+HOME_URL="https://rockylinux.org/"
+VENDOR_NAME="RESF"
+VENDOR_URL="https://resf.org/"
+BUG_REPORT_URL="https://bugs.rockylinux.org/"
+SUPPORT_END="2032-05-31"
+ROCKY_SUPPORT_PRODUCT="Rocky-Linux-9"
+ROCKY_SUPPORT_PRODUCT_VERSION="9.6"
+REDHAT_SUPPORT_PRODUCT="Rocky Linux"
+REDHAT_SUPPORT_PRODUCT_VERSION="9.6"
+"""
+
 architecturePayloads = [
   ['osx_x86-64', False, [], ('','',''), 'Darwin', 'x86-64'],
   ['osx_arm64', False, [], ('','',''), 'Darwin', 'arm64'],
   ['slc5_x86-64', False, [], ('redhat', '5.XX', 'Boron'), 'Linux', 'x86-64'],
   ['slc6_x86-64', False, [], ('centos', '6.X', 'Carbon'), 'Linux', 'x86-64'],
   ['slc7_x86-64', False, [], ('centos', '7.X', 'Ptor'), 'Linux', 'x86-64'],
+  ['slc8_x86-64', True, ALMA_8_OS_RELEASE.split("\n"), ('AlmaLinux', '8.10', 'Cerulean Leopard'), 'Linux', 'x86_64'],
+  ['slc8_x86-64', True, ROCKY_8_OS_RELEASE.split("\n"), ('Rocky Linux', '8.10', 'Green Obsidian'), 'Linux', 'x86_64'],
+  ['slc9_x86-64', True, ALMA_9_OS_RELEASE.split("\n"), ('AlmaLinux', '9.6', 'Sage Margay'), 'Linux', 'x86_64'],
+  ['slc9_x86-64', True, ROCKY_9_OS_RELEASE.split("\n"), ('Rocky Linux', '9.6', 'Blue Onyx'), 'Linux', 'x86_64'],
   ['ubuntu1804_x86-64', True, UBUNTU_1804_OS_RELEASE.split("\n"), ('Ubuntu', '18.04', 'bionic'), 'Linux', 'x86-64'],
   ['ubuntu1604_x86-64', True, UBUNTU_1604_OS_RELEASE.split("\n"), ('Ubuntu', '16.04', 'xenial'), 'Linux', 'x86-64'],
   ['ubuntu1510_x86-64', False, [], ('Ubuntu', '15.10', 'wily'), 'Linux', 'x86-64'],

tests/test_workarea.py

@@ -57,7 +57,7 @@ class WorkareaTestCase(unittest.TestCase):
         mock_exists.assert_has_calls([])
         mock_makedirs.assert_called_with("%s/sw/MIRROR" % getcwd(), exist_ok=True)
         mock_git.assert_called_once_with([
-            "fetch", "-f", "--filter=blob:none", spec["source"], "+refs/tags/*:refs/tags/*", "+refs/heads/*:refs/heads/*",
+            "fetch", "-f", "--prune", "--filter=blob:none", spec["source"], "+refs/tags/*:refs/tags/*", "+refs/heads/*:refs/heads/*",
         ], directory="%s/sw/MIRROR/aliroot" % getcwd(), check=False, prompt=True)
         self.assertEqual(spec.get("reference"), "%s/sw/MIRROR/aliroot" % getcwd())
 

docs/README.md

@@ -1 +0,0 @@
-Read the documentation here: <http://alisw.github.io/alibuild/>