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

[CLIENT-1837] CI/CD: Label version with git commit when building on a non-tagged commit #605

Merged
merged 39 commits into from
May 16, 2024

Conversation

juliannguyen4
Copy link
Collaborator

@juliannguyen4 juliannguyen4 commented Apr 18, 2024

Notes

  • aerospike.__version__ is not updated to include any local version identifiers (i.e +<string>) by versioningit, so it is outdated. This should not matter for release versions since they should not include local version identifiers

Local feature testing. Wheel names for:

  • Build on non-tag commit: aerospike-15.0.1rc2.dev8+38.g853cc8eb-cp311-cp311-macosx_14_0_arm64.whl
  • Build on a tag (16.0.0 tag): aerospike-16.0.0-cp311-cp311-macosx_14_0_arm64.whl
  • Build on a tag and dirty repo: aerospike-16.0.0+0.g853cc8eb.dirty-cp311-cp311-macosx_14_0_arm64.whl
  • Build on a dirty repo and non-tag commit: aerospike-15.0.1rc2.dev8+38.g853cc8eb.dirty-cp311-cp311-macosx_14_0_arm64.whl

Feature testing on Github Actions (Build wheels):

Wheel names produced by these jobs are all correct:

Regression testing

Do these workflows still create a valid config.conf and connect to the server successfully for testing?

TODO

Let QE know about changes to config.conf

@juliannguyen4 juliannguyen4 changed the title [CLIENT-1837] CI/CD: Include git commit when building on a non-tagged commit [CLIENT-1837] CI/CD: Label version with git commit when building on a non-tagged commit Apr 19, 2024
@codecov-commenter
Copy link

codecov-commenter commented Apr 19, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 81.35%. Comparing base (c5438a5) to head (dcab6a5).
Report is 1 commits behind head on dev.

Additional details and impacted files
@@           Coverage Diff           @@
##              dev     #605   +/-   ##
=======================================
  Coverage   81.35%   81.35%           
=======================================
  Files         100      100           
  Lines       15356    15356           
=======================================
  Hits        12493    12493           
  Misses       2863     2863           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

@justinlee-aerospike justinlee-aerospike left a comment

Choose a reason for hiding this comment

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

looks good

Copy link
Contributor

@justinlee-aerospike justinlee-aerospike left a comment

Choose a reason for hiding this comment

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

changes look good

@juliannguyen4 juliannguyen4 merged commit 17335dc into dev May 16, 2024
55 of 56 checks passed
@juliannguyen4 juliannguyen4 deleted the CLIENT-1837-cicd-git-commit-in-version branch May 16, 2024 21:33
DomPeliniAerospike added a commit that referenced this pull request May 22, 2024
* [CLIENT-1837] CI/CD: Label version with git commit when building on a non-tagged commit (#605)

* Also label version when building unoptimized, with macOS debug support, or with uncommitted changes to the repo (i.e add a "dirty" label)
* Rename config.conf to config.conf.template and add config.conf to .gitignore, so creating and modifying config.conf won't cause the repo to be in a dirty state

* Auto-bump version to 15.0.1rc3.dev1 [skip ci]

* [DEVOPS-234] CI/CD: Build manylinux wheels and upload them to JFrog on every push to an arbitrary branch (#606)

* CI/CD: Add option to build and upload unoptimized wheels to JFrog for QE

* Auto-bump version to 15.0.1rc3.dev2 [skip ci]

---------

Co-authored-by: juliannguyen4 <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants