Skip to content
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

Enable nightly standalone packages to install mslice nightly versions #38674

Merged
merged 1 commit into from
Jan 27, 2025
Merged

Enable nightly standalone packages to install mslice nightly versions #38674

Show file tree
Hide file tree
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
10 changes: 9 additions & 1 deletion installers/conda/linux/create_tarball.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,17 @@ mkdir -p "$bundle_contents"
# Create conda environment internally. --copy ensures no symlinks are used
bundle_conda_prefix="$bundle_contents"

# The mantid channel is required as the source for installing mslice
mantid_channel=mantid
# If it's a Nightly or Unstable package, use the mantid/label/nightly label so it picks up
# the nightly version of mslice
if [[ "$suffix" == "Unstable" ]] || [[ "$suffix" == "Nightly" ]]; then
mantid_channel=mantid/label/nightly
fi

echo "Creating Conda environment in '$bundle_conda_prefix'"
"$CONDA_EXE" create --quiet --prefix "$bundle_conda_prefix" --copy \
--channel "$conda_channel" --channel conda-forge --channel mantid --yes \
--channel "$conda_channel" --channel conda-forge --channel $mantid_channel --yes \
mantidworkbench \
jq # used for processing the version string
echo
Expand Down
10 changes: 9 additions & 1 deletion installers/conda/osx/create_bundle.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,17 @@ mkdir -p "$bundle_contents"/{Resources,MacOS}
# --platform osx-64 is required to allow ARM-based systems to install the osx-64 mantid packages.
bundle_conda_prefix="$bundle_contents"/Resources

# The mantid channel is required as the source for installing mslice
mantid_channel=mantid
# If it's a Nightly or Unstable package, use the mantid/label/nightly label so it picks up
# the nightly version of mslice
if [[ "$suffix" == "Unstable" ]] || [[ "$suffix" == "Nightly" ]]; then
mantid_channel=mantid/label/nightly
fi

echo "Creating Conda environment in '$bundle_conda_prefix'"
"$CONDA_EXE" create --quiet --prefix "$bundle_conda_prefix" --copy --platform osx-64 \
--channel "$conda_channel" --channel conda-forge --channel mantid --yes \
--channel "$conda_channel" --channel conda-forge --channel $mantid_channel --yes \
mantidworkbench \
jq # used for processing the version string
echo
Expand Down
10 changes: 9 additions & 1 deletion installers/conda/win/create_package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,17 @@ rm -rf $CONDA_ENV_PATH

mkdir $COPY_DIR

# The mantid channel is required as the source for installing mslice
MANTID_CHANNEL=mantid
# If it's a Nightly or Unstable package, use the mantid/label/nightly label so it picks up
# the nightly version of mslice
if [[ "$SUFFIX" == "Unstable" ]] || [[ "$SUFFIX" == "Nightly" ]]; then
MANTID_CHANNEL=mantid/label/nightly
fi

echo "Creating conda env from mantidworkbench and jq"
"$CONDA_EXE" create --prefix $CONDA_ENV_PATH \
--copy --channel $CONDA_CHANNEL --channel conda-forge --channel mantid -y \
--copy --channel $CONDA_CHANNEL --channel conda-forge --channel $MANTID_CHANNEL -y \
mantidworkbench \
m2w64-jq
echo "Conda env created"
Expand Down
Loading