Skip to content

Commit

Permalink
Fix use of conda-platform
Browse files Browse the repository at this point in the history
  • Loading branch information
j-woz committed Sep 11, 2024
1 parent 907ddcd commit 4e7a57f
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion dev/jenkins/anaconda.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,18 @@ if [[ ${RUNNER_OS:-0} == "macOS" ]] {
}

# Set CONDA_ARCH, the name for our chip in the Miniconda download:
# Set CONDA_PLATFORM, the name for our platform
# in our Anaconda builder
if [[ ${RUNNER_ARCH:-0} == "ARM64" ]] {
# On GitHub, we may be on ARM:
CONDA_ARCH="arm64"
CONDA_PLATFORM="osx-arm64"
} else {
CONDA_ARCH="x86_64"
case $CONDA_OS {
MacOSX) CONDA_PLATFORM="osx-64" ;;
Linux) CONDA_PLATFORM="linux-64" ;;
}
}

# The Miniconda we are working with:
Expand Down Expand Up @@ -171,7 +178,7 @@ task $SWIFT_T/dev/release/make-release-pkg.zsh -T
# Set up the build environment in Miniconda-build
task $SWIFT_T/dev/conda/setup-conda.sh
# Build the Swift/T package!
task $SWIFT_T/dev/conda/linux-64/conda-platform.sh ${R}
task $SWIFT_T/dev/conda/conda-platform.sh $R $CONDA_PLATFORM

log "CHECKING PACKAGE..."
BLD_DIR=$WORKSPACE/sfw/Miniconda-build/conda-bld/linux-64
Expand Down

0 comments on commit 4e7a57f

Please sign in to comment.