Skip to content

Commit fb74a9d

Browse files
committed
fix: address review — guard OSS_VERSION + modern conda activate
- Add guard to fail early if OSS_VERSION is empty instead of silently writing empty version into build.sbt - Replace deprecated 'source activate' with modern conda syntax (eval conda shell.bash hook + conda activate) in all 4 occurrences Co-authored-by: Samhitha Mamindla <smamindla@microsoft.com>
1 parent 7d1b4d9 commit fb74a9d

1 file changed

Lines changed: 9 additions & 4 deletions

File tree

pipeline.yaml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -844,6 +844,7 @@ jobs:
844844
cd $(Build.SourcesDirectory)/SynapseML-Internal
845845
846846
echo "=== Retargeting Internal to OSS version $(OSS_VERSION) ==="
847+
[ -n "$(OSS_VERSION)" ] || { echo "##vso[task.logissue type=error]OSS_VERSION is not set"; exit 1; }
847848
sed -i 's|val synapseMLVersion = ".*"|val synapseMLVersion = "$(OSS_VERSION)"|' build.sbt
848849
sed -i '/^resolvers ++= Seq(/a\ Resolver.mavenLocal,' build.sbt
849850
@@ -914,7 +915,8 @@ jobs:
914915
inlineScript: |
915916
set -e
916917
cd $(Build.SourcesDirectory)/SynapseML-Internal
917-
source activate synapseml-internal
918+
eval "$(conda shell.bash hook)"
919+
conda activate synapseml-internal
918920
export CREATE_SEMPY_WRITER=false
919921
export SBT_OPTS="-Xmx4G -Xss2M -Duser.timezone=GMT"
920922
echo "Running Internal tests against OSS $(OSS_VERSION)..."
@@ -944,7 +946,8 @@ jobs:
944946
inlineScript: |
945947
set -e
946948
cd $(Build.SourcesDirectory)/SynapseML-Internal
947-
source activate synapseml-internal
949+
eval "$(conda shell.bash hook)"
950+
conda activate synapseml-internal
948951
export CREATE_SEMPY_WRITER=false
949952
export SBT_OPTS="-Xmx4G -Xss2M -Duser.timezone=GMT"
950953
echo "Packaging Internal Python against OSS $(OSS_VERSION)..."
@@ -961,7 +964,8 @@ jobs:
961964
inlineScript: |
962965
set -e
963966
cd $(Build.SourcesDirectory)/SynapseML-Internal
964-
source activate synapseml-internal
967+
eval "$(conda shell.bash hook)"
968+
conda activate synapseml-internal
965969
export CREATE_SEMPY_WRITER=false
966970
export SBT_OPTS="-Xmx4G -Xss2M -Duser.timezone=GMT"
967971
echo "Running Internal Python tests against OSS $(OSS_VERSION)..."
@@ -988,7 +992,8 @@ jobs:
988992
inlineScript: |
989993
set -e
990994
cd $(Build.SourcesDirectory)/SynapseML-Internal
991-
source activate synapseml-internal
995+
eval "$(conda shell.bash hook)"
996+
conda activate synapseml-internal
992997
export CREATE_SEMPY_WRITER=false
993998
export SBT_OPTS="-Xmx4G -Xss2M -Duser.timezone=GMT"
994999
echo "Creating MLflow model fixtures..."

0 commit comments

Comments
 (0)