Skip to content
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.

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

Create unique version string for AB dev package #1197

Merged
merged 1 commit into from
Jan 11, 2024
Merged

Conversation

haasad
Copy link
Member

@haasad haasad commented Jan 10, 2024

Fixes #1193

Instead of using the date for the dev version, we create a version string from the latest tag and the number of commits since the latest tag. Eg. 2.9.4dev2. Like this there should be no more problems with conflicts for multiple dev releases on the same day. Also this versioning conveys more useful information than the date. The release date itself can always be checked on https://anaconda.org/bsteubing/activity-browser-dev/files

Checklist

  • Keep pull requests small so they can be easily reviewed.
  • Categorize the PR by setting a good title and adding one of the labels:
    bug, feature, ui, change, documentation, breaking, ci
    as they show up in the changelog.
  • Link this PR to related issues by using closing keywords.
  • Request a review from another developer.

@coveralls
Copy link

coveralls commented Jan 10, 2024

Coverage Status

coverage: 50.944%. remained the same
when pulling 8b9a056 on fix/dev-version
into 7438c37 on master.

@haasad haasad force-pushed the fix/dev-version branch 7 times, most recently from 8a5e56f to aa54031 Compare January 11, 2024 12:21
@haasad haasad changed the title Use conda build git build string for unique dev versions Create unique version string for AB dev package Jan 11, 2024
This creates a unique version number per commit on master branch
@haasad haasad added the ci PRs related to CI of AB label Jan 11, 2024
@haasad haasad marked this pull request as ready for review January 11, 2024 12:34
@haasad haasad requested a review from marc-vdm January 11, 2024 12:34
@marc-vdm marc-vdm requested a review from mrvisscher January 11, 2024 12:47
@marc-vdm marc-vdm added this to the 2.9.5 milestone Jan 11, 2024
@marc-vdm
Copy link
Member

Thanks a lot for having a look at this! I've added @mrvisscher as reviewer, prehaps you had already seen his tag in some places, he's our new developer :)

@mrvisscher mrvisscher merged commit 564894f into master Jan 11, 2024
12 checks passed
@marc-vdm marc-vdm deleted the fix/dev-version branch May 14, 2024 08:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci PRs related to CI of AB
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Failing Dev release with multiple merges on one day
4 participants