Skip to content

DM-54164: Switch uname from p to m to fix a linux x86 bug #350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roceb merged 1 commit into from
Feb 16, 2026
Merged

DM-54164: Switch uname from p to m to fix a linux x86 bug #350

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bin/deploy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ get_tagged_env() {
| grep '^#CONDA_ENV=' | cut -d= -f2) \
|| fail "Unable to determine conda env"
platform="$(uname -s)"
arch="$(uname -p)"
arch="$(uname -m)"
Copy link
Copy Markdown
Member

@timj timj Feb 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this mean that the check against $arch below in the Darwin section needs to be arm64 instead of arm?

Copy link
Copy Markdown
Contributor Author

@roceb roceb Feb 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On my mac, it still worked, but I think switching to arm64 is a better idea.

Copy link
Copy Markdown
Member

@timj timj Feb 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

$ uname -p
arm
$ uname -m
arm64

so not at all clear how this would have passed the test below which was looking for arm.

if [[ "$platform" = "Linux" ]]; then
if [[ "$arch" = "x86_64" ]]; then
eups_platform="redhat/el7/conda-system/miniconda3-${LSST_MINICONDA_VERSION}-$env_version"
Expand All @@ -122,7 +122,7 @@ get_tagged_env() {
elif [[ "$platform" = "Darwin" ]]; then
if [[ "$arch" = "x86_64" ]]; then
eups_platform="osx/10.9/conda-system/miniconda3-${LSST_MINICONDA_VERSION}-$env_version"
elif [[ "$arch" = "arm" ]]; then
elif [[ "$arch" = "arm64" ]]; then
eups_platform="osx/14-arm/conda-system/miniconda3-${LSST_MINICONDA_VERSION}-$env_version"
fi
else
Expand Down