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

Version 1.3.1 #2363

Merged
merged 2 commits into from
Sep 7, 2017
Merged

Version 1.3.1 #2363

merged 2 commits into from
Sep 7, 2017

Conversation

elharo
Copy link
Contributor

@elharo elharo commented Sep 7, 2017

@@ -9,7 +9,7 @@
.p2.inf). p2 generates unique qualifiers for categories, so it would be
best for our non-release builds to have unique versions too.
-->
<product uid="com.google.cloud.tools.eclipse.dist" version="1.3.0.qualifier" useFeatures="true" includeLaunchers="false">
<product uid="com.google.cloud.tools.eclipse.dist" version="1.3.1" useFeatures="true" includeLaunchers="false">
Copy link
Contributor

Choose a reason for hiding this comment

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

I think the release instructions are not up to date. I remember @briandealwis and I decided that we retain .qualifier here and drop it temporarily when actually building binaries in a local tag branch (which is indeed not ideal). I'll update the release instructions.

Copy link
Contributor

Choose a reason for hiding this comment

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

We should retain .qualifier in this PR. I have updated the release instructions accordingly:

  1. Checkout the tag: git checkout <tag>.
  2. Use git status to verify there are no local changes. Make sure you see "nothing to commit, working directory clean".
  3. Drop the .qualifier in gcp-repo/metadata.product (e.g., version="1.3.0.qualifier" to version="1.3.0") and use the exact release version (#2211). Do not commit. git status should show that gcp-repo/metadata.product is the only file that changed.

@briandealwis we are good with this, aren't we?

Copy link
Member

Choose a reason for hiding this comment

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

That's what we did before. Perhaps we should change it slightly and:

  • increment 1.3.1.qualifier
  • commit & push to master
  • tag 1.3.1
  • drop the .qualifier and do the actual build

Otherwise master stays at 1.3.0.qualifier and we'll need to fix that up separately.

Copy link
Contributor

Choose a reason for hiding this comment

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

That's exactly what I am saying. This PR will change the version to 1.3.1.qualifier.

@codecov
Copy link

codecov bot commented Sep 7, 2017

Codecov Report

Merging #2363 into master will increase coverage by 0.06%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##             master   #2363      +/-   ##
===========================================
+ Coverage     71.43%   71.5%   +0.06%     
- Complexity     2122    2125       +3     
===========================================
  Files           325     325              
  Lines         12909   12909              
  Branches       1273    1273              
===========================================
+ Hits           9222    9230       +8     
+ Misses         3157    3151       -6     
+ Partials        530     528       -2
Impacted Files Coverage Δ Complexity Δ
...tools/eclipse/test/util/ThreadDumpingWatchdog.java 65.58% <0%> (+0.93%) 39% <0%> (+1%) ⬆️
...ow/ui/preferences/RunOptionsDefaultsComponent.java 76.01% <0%> (+1.35%) 32% <0%> (+1%) ⬆️
...le/cloud/tools/eclipse/util/status/StatusUtil.java 95% <0%> (+7.5%) 20% <0%> (+1%) ⬆️

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 2b57c3a...39509a0. Read the comment docs.

Copy link
Contributor Author

@elharo elharo left a comment

Choose a reason for hiding this comment

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

PTAL

Copy link
Member

@briandealwis briandealwis left a comment

Choose a reason for hiding this comment

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

LGTM

@briandealwis
Copy link
Member

The rationale for dropping the .qualifier from the product was: since this is a marketing version, this version only ever appears in the category metadata that's shown in the Install Wizard, and we will never re-release a version (we won't re-release 1.3.1, we'll just do 1.3.2), it made sense to have the product version reflect the marketing version. We leave the .qualifier for our normal builds in case we ever aggregate builds (e.g., nightlies).

@elharo elharo merged commit ee5bd73 into master Sep 7, 2017
@elharo elharo deleted the v131 branch December 11, 2017 12:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants