Skip to content

Commit e8f6d82

Browse files
committed
Only remove gdal-master Conda builds for the platform
1 parent 9cabb8d commit e8f6d82

2 files changed

Lines changed: 9 additions & 2 deletions

File tree

ci/travis/conda/compile.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ elif grep -q "macos-15-intel" <<< "$GHA_CI_PLATFORM"; then
2525
ARCH="64"
2626
fi
2727

28+
echo "CONDA_SUBDIR=\"${CONDA_PLAT}-${ARCH}\"" >> $GITHUB_ENV
29+
2830
conda build recipe --clobber-file recipe/recipe_clobber.yaml --output-folder packages -m ".ci_support/${CONDA_PLAT}_${ARCH}_.yaml"
2931
conda create -y -n test -c ./packages/${CONDA_PLAT}-${ARCH} python libgdal gdal
3032
conda deactivate

ci/travis/conda/upload.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ then
88
exit 1
99
fi
1010

11+
if [ -z "${CONDA_SUBDIR+x}" ]; then
12+
echo "CONDA_SUBDIR is not set!"
13+
exit 1
14+
fi
15+
1116
ls
1217
pwd
1318
find .
@@ -31,8 +36,8 @@ for f in $files; do
3136
# extract version number (e.g. 3.12.99)
3237
version=$(echo "$filename" | sed -E 's/^.+-([0-9]+\.[0-9]+\.[0-9]+).*/\1/')
3338

34-
echo "Removing gdal-master/$pkg/$version"
35-
anaconda -t "$ANACONDA_TOKEN" remove -f "gdal-master/$pkg/$version" || true
39+
echo "Removing gdal-master/$pkg/$version/$CONDA_SUBDIR"
40+
anaconda -t "$ANACONDA_TOKEN" remove -f "gdal-master/$pkg/$version/$CONDA_SUBDIR" || true
3641

3742
echo "Uploading $filename"
3843
anaconda -t "$ANACONDA_TOKEN" upload --force --no-progress --user gdal-master "$f"

0 commit comments

Comments
 (0)