try actually uploading packages

rapidsai · Oct 28, 2024 · b63549b · b63549b
1 parent d2fafbc
commit b63549b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/ci/build_python.sh b/ci/build_python.sh
@@ -8,7 +8,7 @@ rapids-generate-version > ./VERSION
 
 CMAKE_GENERATOR=Ninja \
 CONDA_OVERRIDE_CUDA="${RAPIDS_CUDA_VERSION}" \
-LEGATEBOOST_PACKAGE_VERSION=$(head -1 ./VERSION) \
+LEGATEBOOST_PACKAGE_VERSION="24.09.00dev0" \
 rapids-conda-retry mambabuild \
     --channel legate \
     --channel legate/label/experimental \

diff --git a/ci/upload-to-anaconda.sh b/ci/upload-to-anaconda.sh
@@ -22,14 +22,15 @@ if [ -z "${PKGS_TO_UPLOAD}" ]; then
     ls -l "${RAPIDS_LOCAL_CONDA_CHANNEL}/"*
 fi
 
-rapids-echo-stderr "Uploading packages to Anaconda.org (channel='legate', label='${conda_label}'): ${PKGS_TO_UPLOAD}"
+rapids-echo-stderr "Uploading packages to Anaconda.org (channel='legate', label='${conda_label}'):"
+rapids-echo-stderr "${PKGS_TO_UPLOAD}"
 
-# export RAPIDS_RETRY_SLEEP=180
-# # shellcheck disable=SC2086
-# rapids-retry anaconda \
-#     -t "${CONDA_LEGATE_TOKEN}" \
-#     upload \
-#     --label "${RAPIDS_CONDA_UPLOAD_LABEL:-main}" \
-#     --skip-existing \
-#     --no-progress \
-#     ${PKGS_TO_UPLOAD}
+# shellcheck disable=SC2086
+RAPIDS_RETRY_SLEEP=180 \
+    rapids-retry anaconda \
+        -t "${CONDA_LEGATE_TOKEN}" \
+        upload \
+        --label "${conda_label}" \
+        --skip-existing \
+        --no-progress \
+        ${PKGS_TO_UPLOAD}
diff --git a/contributing.md b/contributing.md
@@ -223,8 +223,8 @@ git push origin update-version
 ```shell
 git checkout main
 git pull upstream main
-git tag -a v24.12.00dev -m "v24.12.00dev"
-git push upstream v24.12.00dev
+git tag -a v24.12.00.dev -m "v24.12.00.dev"
+git push upstream v24.12.00.dev
 ```
 
 From that point forward, all packages produced by CI from the `main` branch will have versions like `v24.12.00.dev{n}`,
@@ -251,8 +251,8 @@ git commit -m 'start v24.09.01 [skip ci]'
 git push upstream release/24.09
 
 # tag the first commit on the new branch as the beginning of the 24.09.01 series
-git tag -a v24.09.01dev -m 'v24.09.01dev'
-git push upstream v24.09.01dev
+git tag -a v24.09.01.dev -m 'v24.09.01.dev'
+git push upstream v24.09.01.dev
 ```
 
 2. Open pull requests targeting that branch and merge them into that branch.
@@ -283,7 +283,7 @@ git cherry-pick release/v24.09
 
 NOTE: The use of `cherry-pick` here is important because it re-writes the commit IDs. That avoids the situation where e.g. the
 `v24.09.01` hotfix tag points to commits on the `main` branch during `v24.12` development (which could lead to those packages
-incorrectly getting `v24.09.01dev{n}` versions).
+incorrectly getting `v24.09.01.dev{n}` versions).
 
 3. Open a pull request to merge that branch into `main`.
 4. Perform a non-squash merge of that pull request.