[Xerte-dev] Re: 2.1

Wed Nov 6 15:32:05 GMT 2013

Good stuff. It's worth noting the git steps, thanks,

From: xerte-dev-bounces at lists.nottingham.ac.uk [mailto:xerte-dev-bounces at lists.nottingham.ac.uk] On Behalf Of Tom Reijnders
Sent: 06 November 2013 15:29
To: For Xerte technical developers
Subject: [Xerte-dev] Re: 2.1

Done:

1. Created new local branch
git branch hotfix_2.1_import

2. Pushed to github
git push origin hotfix_2.1_import

3. Make sure it gets tracked automatically:
git branch --set-upstream-to hotfix_2.1_import origin/hotfix_2.1_import

4. Checkout new branch
git checkout hotfix_2.1_import

5. Do the fix, test, add and commit fix to hotfix branch hotfix_2.1_import

6. Merge
git checkout develop
git merge hotfix_2.1_import
git checkout master
git merge hotfix_2.1_import

7. Push fix to github
git push

Julian Tenney schreef op 6-11-2013 15:47:
OK!

From: xerte-dev-bounces at lists.nottingham.ac.uk<mailto:xerte-dev-bounces at lists.nottingham.ac.uk> [mailto:xerte-dev-bounces at lists.nottingham.ac.uk] On Behalf Of Tom Reijnders
Sent: 06 November 2013 14:42
To: For Xerte technical developers
Subject: [Xerte-dev] Re: 2.1

Hmm...

I think I have another hotfix coming up...

I deployed 2.1 to the same server as where the community website is running on, and import isn't working because of the fact that ZipArchive isn't supported in php on that machine. I want to get rid of that dependency, as we use another class for the actual unzipping anyways.

Tom
Tom Reijnders schreef op 4-11-2013 17:31:
The2.1 zip is on the community website, but I haven't had the opportunity yet to test it, and to make sure it works as expected.....
Julian Tenney schreef op 4-11-2013 14:45:
Nice one, thanks for your help everybody. Another step forward!

From: xerte-dev-bounces at lists.nottingham.ac.uk<mailto:xerte-dev-bounces at lists.nottingham.ac.uk> [mailto:xerte-dev-bounces at lists.nottingham.ac.uk] On Behalf Of Tom Reijnders
Sent: 04 November 2013 13:37
To: For Xerte technical developers
Subject: [Xerte-dev] Re: 2.1

I had to set the tag, and mind you, it's really important to have a tag name that is different from a branch name (so v2.1, i.s.o. 2.1)

You have to specify --tags to the push command, to be able to set the tag on github as well.

All seems to be fine now, so I'll try to get 2.1 uploaded to the website!

Tom
Julian Tenney schreef op 4-11-2013 14:25:
OK, as far as I can tell I've just disabled Moscow's traffic light system and sent the international space sation into a slightly wider orbit, and it's entirely possible that along the way I also managed to merge the various branches and create a tag.

So master is now develop is now 2.1 and tagged.

Can you please check it looks as you think it should look?

Many thanks,

J

From: xerte-dev-bounces at lists.nottingham.ac.uk<mailto:xerte-dev-bounces at lists.nottingham.ac.uk> [mailto:xerte-dev-bounces at lists.nottingham.ac.uk] On Behalf Of Tom Reijnders
Sent: 04 November 2013 12:36
To: For Xerte technical developers
Subject: [Xerte-dev] Re: 2.1

Yes!

Give me a heads up when git is ready (i.e. 2.1 is merged into development again).
And it needs to merged into master.
We need (or I need) to set a tag v.2.1 to the merge point on master, and I'll make sure we get a 2.1 release from master on the Community Website.

Tom

Julian Tenney schreef op 4-11-2013 13:32:
Shall we go for it then?

From: xerte-dev-bounces at lists.nottingham.ac.uk<mailto:xerte-dev-bounces at lists.nottingham.ac.uk> [mailto:xerte-dev-bounces at lists.nottingham.ac.uk] On Behalf Of Smith, John
Sent: 04 November 2013 10:30
To: For Xerte technical developers
Subject: [Xerte-dev] Re: 2.1

Nor do I...

Regards,

John Smith
Learning Technologist
School of Health & Life Sciences
Glasgow Caledonian University

From: xerte-dev-bounces at lists.nottingham.ac.uk<mailto:xerte-dev-bounces at lists.nottingham.ac.uk> [mailto:xerte-dev-bounces at lists.nottingham.ac.uk] On Behalf Of Ron Mitchell
Sent: Monday, November 04, 2013 10:25 AM
To: For Xerte technical developers
Subject: [Xerte-dev] Re: 2.1

Me neither....

Sent from my iPhone

On 4 Nov 2013, at 10:21, Tom Reijnders <reijnders at tor.nl<mailto:reijnders at tor.nl>> wrote:
I don't know of any showstoppers.

Tom
Julian Tenney schreef op 4-11-2013 10:57:
How close do you think we are to the 2.1 release?

This message and any attachment are intended solely for the addressee and may contain confidential information. If you have received this message in error, please send it back to me, and immediately delete it.   Please do not use, copy or disclose the information contained in this message or in any attachment.  Any views or opinions expressed by the author of this email do not necessarily reflect the views of the University of Nottingham.