Skip to content

Commit

Permalink
Enable nightly standalone packages to install mslice nightly versions
Browse files Browse the repository at this point in the history
  • Loading branch information
thomashampson committed Jan 24, 2025
1 parent b78002e commit 9da8f58
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 3 deletions.
10 changes: 9 additions & 1 deletion installers/conda/linux/create_tarball.sh
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
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
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

0 comments on commit 9da8f58

Please sign in to comment.