Thanks, Konstantin.
That did the trick; I was able to push JSF maps for 3.5 and 3.4.1.
- Ian
From: Konstantin Komissarchik
Sent: Thursday, August 16, 2012 3:06 PM
To: Webtools releng discussion list
Subject: Re: [wtp-releng] Preparing for Juno SR1 RC1, and Kepler M1 builds
That enlightening message means that your cloned repository is out of date. Perform fetch followed by rebase and you will be able to push.
- Konstantin
I am unable to push to webtools.maps (as itrimble). I get simply “master: master [rejected – non-fast-forward]” as an error message when I try.
Does someone need to give me access (I’m not sure I ever did have access, Raghu always did the release in the past)? Or am I missing something? I was successful in pushing to the 3 webtools.jsf.* repo’s.
Thanks,
- Ian
From: Chuck Bridgham [mailto:cbridgha@xxxxxxxxxx]
Sent: Thursday, August 16, 2012 7:38 AM
To: Webtools releng discussion list
Subject: [wtp-releng] Preparing for Juno SR1 RC1, and Kepler M1 builds
This is great news Carl - Great job moving this forward, I'm sure the entire project appreciates your long hours and late nights....
I assume many of you have patches ready to push and release to the build, so this week we will shift the normal smoke test(s) to Friday, and allow releasing to build
until 12am EST Friday (Tonight). We will discuss any issues in our status meeting today, but I encourage everyone to follow Carl's instructions asap, so we can
have a lively discussion in a few hours.
Happy git'ing!
Thanks - Chuck
Senior Architect, RAD Java EE Tools, WTP PMC Lead
IBM Software Lab - Research Triangle Park, NC
From: Carl Anderson/Raleigh/IBM@IBMUS
To: Webtools releng discussion list <wtp-releng@xxxxxxxxxxx>
Date: 08/16/2012 10:20 AM
Subject: [wtp-releng] A quick run-through of the new release process
Sent by: wtp-releng-bounces@xxxxxxxxxxx
Folks,
First, the good news- the WTP 3.4.1 and 3.5.0 builds are working. I am still cleaning things up, and they must still be launched by hand, but both of them are working. Now, for how to get stuff into those builds:
This information still isn't quite right, but it seems to work (somewhat), and I learned a lot last night, so I wanted to pass that along. Here's what I did last night to release changes for two Java EE plugins and a feature:
First, the code was committed locally and then pushed to git.eclipse.org (the two plugin changes were pushed by another committer, I did the feature change).
Then I figured out what plugins and features were updated - you need to manually store this information.
I tagged the repository in question - in this case, webtools.javaee.git. I had to do this by selecting a project in the Java perspective, brought up the context menu, and then selected Team->Advanced->Tag... and entered the appropriate Tag value and a comment. Note that you tag the entire repository, and not just the plugins and features that changed. I saved the tag value that I entered (in Notepad) for later use.
I pushed that tag to git.eclipse.org. This took me hours to figure out how to do:
Go to the Git Repository Exploring view
Select the repository, bring up the context menu, and select Push... (not Push to Upstream, but Push...)
Hit Next>
Press the Add All Tags Spec button. You should see the tag(s) you added since the last push show up with a new tag entry.
Press Finish
Then I made sure that I was in the right branch for the map files.
(For WTP 3.4.1, the first time, I had to go to the Git Repository Exploring view, and do Switch to-> New Branch... and specify refs/head/R3_4_maintenance for the Source ref, and just type in R3_4_maintenance for the Branch name, and I specified rebase.)
Then I updated the tag value (using the value I saved above) for the plugin(s) and feature(s) that were altered.
Then I committed and pushed the map files.
By doing this process to tag the plugins and feature, and to update the map files in both master and R3_4_maintenance, I was able to put the same change into both the WTP 3.4.1 and 3.5.0 builds. (But to test that the correct map files were pulled for each build, I only changed master, then built both, and verified that the change was not in the 3.4.1 build, and then I made the change in R3_4_maintenance, and now the same change is being pulled into the 3.4.1 build.)
Now, the one thing that befuddles me- I added a file to master in the webtools.maps.git repository... releng/kepler/dependencies.properties. When I switched the branch to R3_4_maintenance and did the push of the updated maps for 3.4.1, that file was also added to R3_4_maintenance. I am not sure why. So I caution you to use care when you use the same local Git repository for both master and R3_4_maintenance- it may be best practice to have separate local repositories. But I am still investigating what happened, and why.
Another little useful EGit tidbit- by pressing Ctrl+space in a comment, you can usually see your past comments. (I much prefer the dropdown that CVS used, but this made life a little easier.)
As I verify this information, I will formally write it up. But for now, I wanted to send a quick note so that people could release things to the WTP 3.4.1 and 3.5.0 builds for this week's declare.
FWIW,
- Carl Anderson
WTP programmer_______________________________________________
wtp-releng mailing list
wtp-releng@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/wtp-releng
