Skip to content

Several aliBuild ports#30

Merged
pbuncic merged 31 commits into
mainfrom
940
Nov 4, 2025
Merged

Several aliBuild ports#30
pbuncic merged 31 commits into
mainfrom
940

Conversation

@singiamtel

@singiamtel singiamtel commented Oct 30, 2025

Copy link
Copy Markdown
Contributor

Trying to get bits up to date with the new developments in aliBuild

Some commits are ported with their revert too, in order for cherry pick to know they are already applied in the future

Commits not ported

alisw/alibuild@e0701b - Fix aliDoctor logs (8 weeks ago)
alisw/alibuild@27e593 - Add tests for multiline env variables (3 months ago)
alisw/alibuild@eaa5e1 - Fix multiline env variables (3 months ago)
alisw/alibuild@d66d22 - Load CLI environment variables in prefer_system_check (#947) (4 months ago)
alisw/alibuild@95d514 - Allow for extra variables, volumes in the docker runner (#935) (4 months ago)
alisw/alibuild@7b812d9 - Add location of alidist as ALIBUILD_CONFIG_DIR variable (#934) (5 months ago)
alisw/alibuild@150599 - Introduce new helpers to support BITS_PATH (#897) (9 months ago)

In order to merge these, we need to decide:

  • Which BITS_PATH implementation we'd like to keep (aliBuild and bits have two different ones)
  • How to rename the ALIBUILD_CONFIG_DIR variable (BITS_CONFIG_DIR?)

@singiamtel singiamtel changed the title aliBuild port - Fix release action (#940) Several aliBuild ports Oct 30, 2025
@singiamtel
singiamtel marked this pull request as draft October 30, 2025 11:07
sfayer and others added 22 commits October 30, 2025 12:07
Seems like a requirement from pypi. It can make the release fail to
publish, so it's better to check early
This reverts commit 42f05f6e265cbd52f62dd66e97c5fbfca07803fe.
Until pyp2rpm supports not having them. See:

fedora-python/pyp2rpm#286
This reverts commit d0b6a7065146de333536d07274aa5ad842d449d1.
Fixes situations like the remote repository deleting a branch `a` and
creating a branch `a/b`. Otherwise we have situations like the
following:

```
error: cannot lock ref 'refs/remotes/origin/a/b': 'refs/remotes/a' exists; cannot create 'refs/remotes/origin/a/b'
```

Solution adapted from https://stackoverflow.com/a/67060742/20041091
The performPreferCheck function in init.py was hardcoded to always return
(1, "") which caused all track_env commands to fail during initialization.

Fixes error: "Error while executing track_env for O2PhysicsO2PHYSICS_COMPONENTS: echo
${O2PHYSICS_COMPONENTS:-install} =>"

Regression spotted in alisw/alidist#5888
* If no bookmarks are found, consider always the same branchOrRef,
  as if you where on a branch called "none".
* If a bookmark is there, use the bookmark as identifier for branchOrRef.
zlib<1.3.1 doesn't build in the newer XCode. I'm bumping the zlib
version and fixing the architecture for the macOS ARM tests in general
Adding some missing flags, updating some tables, supported archs, etc
@singiamtel
singiamtel marked this pull request as ready for review October 30, 2025 11:22
@singiamtel

Copy link
Copy Markdown
Contributor Author

CC @ktf @pbuncic

@ktf

ktf commented Oct 30, 2025

Copy link
Copy Markdown
Collaborator

Which BITS_PATH implementation we'd like to keep (aliBuild and bits have two different ones)

Definitely keep the bits one for bits.

How to rename the ALIBUILD_CONFIG_DIR variable (BITS_CONFIG_DIR?)

Sounds good.

ktf and others added 7 commits November 4, 2025 10:51
* Allow for extra variables, volumes in the docker runner
* Also inject variables when using docker
* Pass ALIBUILD_CONFIG_DIR to the prefer_system_check
* Mount alidist as volume

---------

Co-authored-by: Sergio Garcia <sergio.garcia.de.la.cruz@cern.ch>
Regression in #947
@pbuncic
pbuncic merged commit 8a295b7 into main Nov 4, 2025
1 of 12 checks passed
@pbuncic
pbuncic deleted the 940 branch June 18, 2026 07:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants