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

chore: improve embedded version handling #715

Merged
merged 9 commits into from
Apr 13, 2021

Conversation

igorbernstein2
Copy link
Contributor

Use new feature in releasetool (googleapis/releasetool#317) to manage the client version instead of maven tricks introduced in #451

This should not be merged until the releasetool feature is released

Use new feature in releasetool (googleapis/releasetool#317) to manage the client version instead of maven tricks introduced in googleapis#451
@igorbernstein2 igorbernstein2 added the do not merge Indicates a pull request not ready for merge, due to either quality or timing. label Apr 9, 2021
@product-auto-label product-auto-label bot added the api: bigtable Issues related to the googleapis/java-bigtable API. label Apr 9, 2021
@google-cla google-cla bot added the cla: yes This human has signed the Contributor License Agreement. label Apr 9, 2021
@igorbernstein2
Copy link
Contributor Author

Jeff is putting together a more general solution in googleapis/release-please#850. Need to wait for that

@codecov
Copy link

codecov bot commented Apr 9, 2021

Codecov Report

Merging #715 (5db85f8) into master (b61c5ce) will decrease coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #715      +/-   ##
============================================
- Coverage     83.62%   83.62%   -0.01%     
  Complexity     1008     1008              
============================================
  Files           106      106              
  Lines          6046     6045       -1     
  Branches        392      392              
============================================
- Hits           5056     5055       -1     
  Misses          788      788              
  Partials        202      202              
Impacted Files Coverage Δ Complexity Δ
...c/main/java/com/google/cloud/bigtable/Version.java 50.00% <100.00%> (ø) 1.00 <1.00> (?)
...ud/bigtable/data/v2/stub/EnhancedBigtableStub.java 97.03% <100.00%> (-0.02%) 29.00 <0.00> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b61c5ce...5db85f8. Read the comment docs.

@chingor13
Copy link
Collaborator

After googleapis/repo-automation-bots#1629 is merged, you should be able to add:

extraFiles:
  - google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/ClientVersion.java

to .github/release-please.yml and automation should be able to replace the version string.

@generated-files-bot
Copy link

Warning: This pull request is touching the following templated files:

  • .github/release-please.yml

@igorbernstein2 igorbernstein2 marked this pull request as ready for review April 9, 2021 21:30
@igorbernstein2 igorbernstein2 requested review from a team as code owners April 9, 2021 21:30
@igorbernstein2 igorbernstein2 removed the do not merge Indicates a pull request not ready for merge, due to either quality or timing. label Apr 9, 2021
@igorbernstein2 igorbernstein2 added automerge Merge the pull request once unit tests and other checks pass. kokoro:force-run Add this label to force Kokoro to re-run the tests. labels Apr 13, 2021
@yoshi-kokoro yoshi-kokoro removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Apr 13, 2021
@gcf-merge-on-green
Copy link

Your PR has conflicts that you need to resolve before merge-on-green can automerge

# Conflicts:
#	google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubTest.java
@igorbernstein2 igorbernstein2 merged commit 1af8925 into googleapis:master Apr 13, 2021
@gcf-merge-on-green gcf-merge-on-green bot removed the automerge Merge the pull request once unit tests and other checks pass. label Apr 13, 2021
@igorbernstein2 igorbernstein2 deleted the improve-versioning branch April 13, 2021 18:01
kolea2 pushed a commit to kolea2/java-bigtable that referenced this pull request May 20, 2021
* chore: improve embedded version handling

Use new feature in releasetool (googleapis/releasetool#317) to manage the client version instead of maven tricks introduced in googleapis#451

* migrate to new version scheme

* rename back to Version

* config release-please for version bumps

* make sure file doesnt get clobbered

* add a couple of tests

* fmt

(cherry picked from commit 1af8925)
kolea2 added a commit that referenced this pull request May 21, 2021
* chore: improve embedded version handling (#715)

* chore: improve embedded version handling

Use new feature in releasetool (googleapis/releasetool#317) to manage the client version instead of maven tricks introduced in #451

* migrate to new version scheme

* rename back to Version

* config release-please for version bumps

* make sure file doesnt get clobbered

* add a couple of tests

* fmt

(cherry picked from commit 1af8925)

* update version

* fix test

* fix: add back in extraFiles and fix file path (#833)

(cherry picked from commit f914954)

* fix test

Co-authored-by: Igor Bernstein <igorbernstein@google.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
api: bigtable Issues related to the googleapis/java-bigtable API. cla: yes This human has signed the Contributor License Agreement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants