alibuild 1.17.29__tar.gz → 1.17.31__tar.gz

{alibuild-1.17.29 → alibuild-1.17.31}/.github/workflows/pr-check.yml

@@ -30,6 +30,7 @@ jobs:
           - '3.11'
           - '3.12'
           - '3.13'
+          - '3.14'
 
     steps:
       - uses: actions/checkout@v4
@@ -75,6 +76,7 @@ jobs:
           - '3.11'
           - '3.12'
           - '3.13'
+          - '3.14'
 
     steps:
       - uses: actions/checkout@v4

{alibuild-1.17.29 → alibuild-1.17.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alibuild
-Version: 1.17.29
+Version: 1.17.31
 Summary: ALICE Build Tool
 Home-page: https://alisw.github.io/alibuild
 Author: Giulio Eulisse

{alibuild-1.17.29 → alibuild-1.17.31}/alibuild.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alibuild
-Version: 1.17.29
+Version: 1.17.31
 Summary: ALICE Build Tool
 Home-page: https://alisw.github.io/alibuild
 Author: Giulio Eulisse

{alibuild-1.17.29 → alibuild-1.17.31}/alibuild_helpers/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.17.29'
-__version_tuple__ = version_tuple = (1, 17, 29)
+__version__ = version = '1.17.31'
+__version_tuple__ = version_tuple = (1, 17, 31)
 
-__commit_id__ = commit_id = 'g0c5711562'
+__commit_id__ = commit_id = 'ga48e22c31'

{alibuild-1.17.29 → alibuild-1.17.31}/alibuild_helpers/build.py

@@ -58,7 +58,7 @@ def update_git_repos(args, specs, buildOrder):
         specs[package]["scm"] = Git()
         if specs[package]["is_devel_pkg"]:
             specs[package]["source"] = os.path.join(os.getcwd(), specs[package]["package"])
-            if exists(os.path.join(specs[package]["source"], ".sl")):
+            if exists(os.path.join(specs[package]["source"], ".sl")) or exists(os.path.join(specs[package]["source"], ".git/sl")):
                 specs[package]["scm"] = Sapling()
         updateReferenceRepoSpec(args.referenceSources, package, specs[package],
                                 fetch=args.fetchRepos, allowGitPrompt=git_prompt)

{alibuild-1.17.29 → alibuild-1.17.31}/alibuild_helpers/init.py

@@ -3,6 +3,7 @@ from alibuild_helpers.utilities import getPackageList, parseDefaults, readDefaul
 from alibuild_helpers.log import debug, error, warning, banner, info
 from alibuild_helpers.log import dieOnError
 from alibuild_helpers.workarea import updateReferenceRepoSpec
+from alibuild_helpers.cmd import getstatusoutput
 
 from os.path import join
 import os.path as path
@@ -54,7 +55,7 @@ def doInit(args):
                                          architecture="",
                                          disable=[],
                                          defaults=args.defaults,
-                                         performPreferCheck=lambda *x, **y: (1, ""),
+                                         performPreferCheck=lambda pkg, cmd: getstatusoutput(["bash", "-c", cmd]),
                                          performRequirementCheck=lambda *x, **y: (0, ""),
                                          performValidateDefaults=lambda spec : validateDefaults(spec, args.defaults),
                                          overrides=overrides,

{alibuild-1.17.29 → alibuild-1.17.31}/alibuild_helpers/sl.py

@@ -20,9 +20,22 @@ class Sapling(SCM):
     return sapling(("whereami", ), directory)
 
   def branchOrRef(self, directory):
-    # Format is <hash>[+] <branch>
-    identity = sapling(("identify", ), directory)
-    return identity.split(" ")[-1]
+    # Format is * branch     ref or nothing
+    err, output = getstatusoutput("""\
+    set -e +x
+    sl -R {directory} bookmark -r . 2>/dev/null | grep -- "*"
+    """.format(
+        directory=quote(directory),
+    ), timeout=SL_COMMAND_TIMEOUT_SEC)
+    if err > 1:
+        raise SCMError("Error {} from sl bookmark -r . : {}".format(err, output))
+    # We use "none" to indicate there are no bookmarks. This means
+    # that a devel package will act as a single branch, regardless of where we are.
+    if not output.strip():
+      return "none"
+    # If a bookmark is there, we use it to determine that we should rebuild
+    # when we move to it
+    return output.split(" ")[2]
 
   def exec(self, *args, **kwargs):
     return sapling(*args, **kwargs)

{alibuild-1.17.29 → alibuild-1.17.31}/alibuild_helpers/sync.py

@@ -7,6 +7,7 @@ import re
 import sys
 import time
 import requests
+from concurrent.futures import ThreadPoolExecutor, as_completed
 from requests.exceptions import RequestException
 from urllib.parse import quote
 
@@ -682,19 +683,44 @@ class Boto3RemoteSync:
     # Second, upload dist symlinks. These should be in place before the main
     # tarball, to avoid races in the publisher.
     start_time = time.time()
-    for link_dir, symlinks in dist_symlinks.items():
-      for link_key, hash_path in symlinks:
-        self.s3.put_object(Bucket=self.writeStore,
-                           Key=link_key,
-                           Body=os.fsencode(hash_path),
-                           ACL="public-read",
-                           WebsiteRedirectLocation=hash_path)
-      debug("Uploaded %d dist symlinks to S3 from %s",
-            len(symlinks), link_dir)
+    total_symlinks = 0
+
+    # Limit concurrency to avoid overwhelming S3 with too many simultaneous requests
+    max_workers = min(32, (len(dist_symlinks) * 10) or 1)
+
+    def _upload_single_symlink(link_key, hash_path):
+      self.s3.put_object(Bucket=self.writeStore,
+                         Key=link_key,
+                         Body=os.fsencode(hash_path),
+                         ACL="public-read",
+                         WebsiteRedirectLocation=hash_path)
+      return link_key
+
+    with ThreadPoolExecutor(max_workers=max_workers) as executor:
+      future_to_info = {}
+      for link_dir, symlinks in dist_symlinks.items():
+        for link_key, hash_path in symlinks:
+          future = executor.submit(_upload_single_symlink, link_key, hash_path)
+          future_to_info[future] = (link_dir, link_key)
+          total_symlinks += 1
+
+      dir_counts = {link_dir: 0 for link_dir in dist_symlinks.keys()}
+      for future in as_completed(future_to_info):
+        link_dir, link_key = future_to_info[future]
+        try:
+          future.result()
+          dir_counts[link_dir] += 1
+        except Exception as e:
+          error("Failed to upload symlink %s: %s", link_key, e)
+          raise
+
+      for link_dir, count in dir_counts.items():
+        if count > 0:
+          debug("Uploaded %d dist symlinks to S3 from %s", count, link_dir)
+
     end_time = time.time()
     debug("Uploaded %d dist symlinks in %.2f seconds",
-          sum(len(symlinks) for _, symlinks in dist_symlinks.items()),
-          end_time - start_time)
+          total_symlinks, end_time - start_time)
 
     self.s3.upload_file(Bucket=self.writeStore, Key=tar_path,
                         Filename=os.path.join(self.workdir, tar_path))

{alibuild-1.17.29 → alibuild-1.17.31}/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,18 +102,18 @@ 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", "--prune", "--filter=blob:none", "https://github.com/root-mirror/root", "+refs/tags/*:refs/tags/*",
                            "+refs/heads/*:refs/heads/*"), "/sw/MIRROR/root", False
@@ -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",
@@ -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)

{alibuild-1.17.29 → alibuild-1.17.31}/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],

{alibuild-1.17.29 → alibuild-1.17.31}/tox.ini

@@ -1,6 +1,6 @@
 [tox]
 minversion = 3.20
-envlist = lint, py{37, 38, 39, 310, 311, 312, 313}, darwin
+envlist = lint, py{37, 38, 39, 310, 311, 312, 313, 314}, darwin
 
 [gh-actions]
 # The "lint" job is run separately.
@@ -12,6 +12,7 @@ python =
     3.11: py311
     3.12: py312
     3.13: py313
+    3.14: py314
 
 ; [testenv:lint]
 ; # Warning: This environment inherits settings from the main [testenv] section.
@@ -121,7 +122,7 @@ commands =
     darwin: sl clone https://github.com/alisw/alidist alidist-sapling
     darwin: coverage run --source={toxinidir} -a {toxinidir}/aliBuild -a {env:ARCHITECTURE} -c alidist-sapling --no-system --disable GCC-Toolchain build zlib
     darwin: rm -fr zlib
-    darwin: sl clone https://github.com/alisw/zlib
+    darwin: sl clone https://github.com/madler/zlib
     darwin: coverage run --source={toxinidir} -a {toxinidir}/aliBuild -a {env:ARCHITECTURE} --no-system --disable GCC-Toolchain build zlib
     touch zlib/foo
     darwin: coverage run --source={toxinidir} -a {toxinidir}/aliBuild -a {env:ARCHITECTURE} --no-system --disable GCC-Toolchain build zlib