Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: Corrected links that should have been relative instead of absolute.

...

[12:06:12 CST(-0600)] <EricDalquist> but I usually add:

[12:06:39 CST(-0600)] <EricDalquist> -DpushChanges=false

[12:06:41 CST(-0600)] <EricDalquist> to prepare

[12:06:44 CST(-0600)] <EricDalquist> and -DlocalCheckout=true

[12:06:45 CST(-0600)] <athena> what's that do?

[12:06:46 CST(-0600)] <EricDalquist> to perform

[12:06:49 CST(-0600)] <athena> ah

[12:06:54 CST(-0600)] <EricDalquist> so that skips the "git push"

[12:06:57 CST(-0600)] <athena> gotcha

[12:07:00 CST(-0600)] <athena> do you do that manually?

[12:07:04 CST(-0600)] <EricDalquist> which means you have to push the pom updates and tags after the fact

[12:07:08 CST(-0600)] <EricDalquist> but it is a little safer

[12:07:10 CST(-0600)] <athena> ok

[12:07:15 CST(-0600)] <EricDalquist> since you can verify that mvn didn't screw anything up

[12:07:20 CST(-0600)] <athena> makes sense

[12:07:23 CST(-0600)] <EricDalquist> and -DlocalCheckout=true is just faster

[12:07:31 CST(-0600)] <EricDalquist> since git is all local mvn can do a local clone

[12:07:34 CST(-0600)] <athena> do you need to do stuff between prepare and release, or just after?

[12:07:41 CST(-0600)] <EricDalquist> just after

[12:07:55 CST(-0600)] <EricDalquist> those two essentially make all the git work happen localy

[12:08:03 CST(-0600)] <EricDalquist> and you just have to push the updates and tag out after the fact

[12:08:08 CST(-0600)] <athena> gotcha

[12:09:41 CST(-0600)] <athena> since we didn't have any objections, i'd like to move some of these portlets over to git after we finish releasing

[12:09:59 CST(-0600)] <EricDalquist> that would be great,

[12:10:11 CST(-0600)] <athena> what do we want to do w/ the svn projects?

[12:10:11 CST(-0600)] <EricDalquist> maybe we can setup a wiki page to catalog a list of projects to move

[12:10:15 CST(-0600)] <athena> sounds great

[12:10:26 CST(-0600)] <EricDalquist> hrm

[12:10:39 CST(-0600)] <EricDalquist> remove commit access of course

[12:10:42 CST(-0600)] <EricDalquist> and then ...

[12:10:50 CST(-0600)] <EricDalquist> I guess we could delete the content from head

[12:11:04 CST(-0600)] <athena> yeah

[12:11:43 CST(-0600)] <EricDalquist> that would be a question for the various project interests

[12:11:51 CST(-0600)] <EricDalquist> could you start on that wiki page when you have a little time?

[12:19:12 CST(-0600)] <athena> yep

[12:22:51 CST(-0600)] <athena> do i need to run this release from the jasig root trunk, or from my fork?

[12:23:05 CST(-0600)] <EricDalquist> you should run it from the main branch for the version

[12:23:10 CST(-0600)] <athena> ok

[12:23:20 CST(-0600)] <EricDalquist> so if master is at 1.0.3-SNAPSHOT and you're releasing 1.0.3 do it from master

[12:25:32 CST(-0600)] <athena> makes sense

[12:49:32 CST(-0600)] <athena> ok

[12:49:35 CST(-0600)] <athena> so release seems to have worked

[12:49:45 CST(-0600)] <athena> i do push origin master to push out the updates, i assume

[12:49:51 CST(-0600)] <athena> what do i need to to do push out the tag?

[12:50:01 CST(-0600)] <EricDalquist> add --tags to the push

[12:50:14 CST(-0600)] <athena> ah

[12:50:16 CST(-0600)] <athena> so easy!

[12:50:55 CST(-0600)] <athena> so when i do this for umobile, i'll just do the same thing, but from the umobile-trunk branch?

[12:51:15 CST(-0600)] <EricDalquist> yup

[12:51:30 CST(-0600)] <athena> terrific (smile)

[12:51:33 CST(-0600)] <athena> <3 good tools

[12:51:38 CST(-0600)] <EricDalquist> I think I might have setup the uportal pom to just have those git options setup

[12:52:09 CST(-0600)] <EricDalquist> looks like I added localCheckout

[12:52:12 CST(-0600)] <athena> ah, nice

[12:52:15 CST(-0600)] <EricDalquist> not sure why I didn't add no-push

[12:52:18 CST(-0600)] <athena> (smile)

[12:52:24 CST(-0600)] <EricDalquist> https://github.com/Jasig/uPortal/blob/master/pom.xml

[12:52:28 CST(-0600)] <athena> would that have affected svn releases?

[12:52:35 CST(-0600)] <EricDalquist> https://github.com/Jasig/uPortal/blob/master/pom.xml#L1089

[12:52:37 CST(-0600)] <athena> oh ok, project-specific

[12:52:39 CST(-0600)] <EricDalquist> yeah

[16:45:23 CST(-0600)] * EricDalquist is loving guit

[16:45:24 CST(-0600)] <EricDalquist> git

[16:45:30 CST(-0600)] <EricDalquist> fixed a bug on our myuw branch

[16:45:40 CST(-0600)] <EricDalquist> "git checkout master" to switch to the main uPortal branch

[16:45:47 CST(-0600)] <EricDalquist> "git cherry-pick cf9d85f" to pull over the fix

[16:45:54 CST(-0600)] <EricDalquist> and then push to jasig/uPortal

[16:45:58 CST(-0600)] <EricDalquist> SO nice

[16:56:21 CST(-0600)] <athena> nice (smile)

[16:56:29 CST(-0600)] <athena> that's completely awesome

[16:56:42 CST(-0600)] <EricDalquist> yeah

[16:56:54 CST(-0600)] <EricDalquist> such a better way to do vendor branch work

[16:57:02 CST(-0600)] <athena> so does the master branch in the myuw fork always represent the clean vanilla trunk?

[16:57:35 CST(-0600)] <EricDalquist> well we only have one myuw specific branch

[16:57:39 CST(-0600)] <EricDalquist> at least right now

[16:57:53 CST(-0600)] <EricDalquist> we took the uportal-4.0.2 branch and forked off of that

[16:58:05 CST(-0600)] <EricDalquist> and have since merged the uportal-4.0.3 tag in

[16:58:22 CST(-0600)] <athena> gotcha

[16:58:29 CST(-0600)] <EricDalquist> the real question is what happens when I merge 4.0.4 since our myuw branch will have fixes that are also going to be in 4.0.4

[16:58:36 CST(-0600)] <athena> yeah

[16:58:41 CST(-0600)] <EricDalquist> is git smart enough to deal with that

[16:58:44 CST(-0600)] <EricDalquist> I'm betting it is

[16:58:47 CST(-0600)] <athena> (smile)

[17:05:31 CST(-0600)] <EricDalquist> does landis work for unicon?

[17:08:32 CST(-0600)] <holdorph> yes

[17:08:47 CST(-0600)] <EricDalquist> just curious (smile)