From d377a0525608697a6400f93aae1ba298b85f46e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Thu, 20 Jan 2022 16:53:26 +0100 Subject: [PATCH 1/3] [Release] Activate base conda env before calling mamba --- dev/release/verify-release-candidate.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/dev/release/verify-release-candidate.sh b/dev/release/verify-release-candidate.sh index d6294f8318d..0456cf2c775 100755 --- a/dev/release/verify-release-candidate.sh +++ b/dev/release/verify-release-candidate.sh @@ -252,6 +252,7 @@ setup_miniconda() { echo "Installed miniconda at ${MINICONDA}" . $MINICONDA/etc/profile.d/conda.sh + conda activate base # Dependencies from python/requirements-build.txt and python/requirements-test.txt # with the exception of oldest-supported-numpy since it doesn't have a conda package From 5806c8226dddc9c27feac65b83816ca61d2771d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Thu, 20 Jan 2022 17:03:13 +0100 Subject: [PATCH 2/3] [Release][Crossbow] Fall back to 0 distance when generating scm version --- dev/archery/archery/crossbow/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/archery/archery/crossbow/core.py b/dev/archery/archery/crossbow/core.py index 92d668059da..fa4500d595b 100644 --- a/dev/archery/archery/crossbow/core.py +++ b/dev/archery/archery/crossbow/core.py @@ -665,7 +665,7 @@ def get_version(root, **kwargs): if 'dev' not in tag: major += 1 - return "{}.{}.{}.dev{}".format(major, minor, patch, version.distance) + return "{}.{}.{}.dev{}".format(major, minor, patch, version.distance or 0) class Serializable: From efcac2731fb6acfb8a7f4b096146a976daa9e6ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Thu, 20 Jan 2022 17:22:25 +0100 Subject: [PATCH 3/3] Set fetch-depth to 0 --- .github/workflows/comment_bot.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/comment_bot.yml b/.github/workflows/comment_bot.yml index b78ae80fb97..3d89c532267 100644 --- a/.github/workflows/comment_bot.yml +++ b/.github/workflows/comment_bot.yml @@ -34,6 +34,8 @@ jobs: uses: actions/checkout@v2 with: path: arrow + # fetch the tags for version number generation + fetch-depth: 0 - name: Set up Python uses: actions/setup-python@v2 with: