Skip to content

ARROW-15393: [Release][Crossbow] Fall back to <version>dev0 when the generated scm version number doesn't have a distance #12210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kszucs wants to merge 3 commits into from
Closed

ARROW-15393: [Release][Crossbow] Fall back to <version>dev0 when the generated scm version number doesn't have a distance #12210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d377a05
[Release] Activate base conda env before calling mamba
kszucs Jan 20, 2022
5806c82
[Release][Crossbow] Fall back to 0 distance when generating scm version
kszucs Jan 20, 2022
efcac27
Set fetch-depth to 0
kszucs Jan 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/comment_bot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion dev/archery/archery/crossbow/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link
Member Author

@kszucs kszucs Jan 20, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably due to the release branch: the latest tag on the release branch is not reachable from the PR's master's HEAD commit.



class Serializable:
Expand Down
1 change: 1 addition & 0 deletions dev/release/verify-release-candidate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ setup_miniconda() {
echo "Installed miniconda at ${MINICONDA}"

. $MINICONDA/etc/profile.d/conda.sh
conda activate base
Copy link
Member Author

@kszucs kszucs Jan 20, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On macOS I had to activate the base conda environment before using mamba.


# 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
Expand Down