During an alpha/beta periods we branch our sites to match the release we are in. All other periods we are using master. Most sites aren't affected by this except for fp.o and spins.fp.o (mainly). We should have put spins.fp.o to be built by the f15-beta branch during beta release but we didn't do so. In turn, that doesn't allow us to make updates in master (we've already merged f15-beta into it) for release day.
Does that make sense?
Sijis
On Fri, May 20, 2011 at 9:33 AM, <Matt_Domsch@xxxxxxxx> wrote:
I'm not familiar with how the sites are built on what branches, but if this is the right way to accomplish that given your branch structure, and because it's easy to revert if necessary, +1.
--
Matt Domsch
Technology Strategist
Social Media and Community Professional
Dell | Office of the CTO
_______________________________________________
-----Original Message-----
From: infrastructure-bounces@xxxxxxxxxxxxxxxxxxxxxxx [mailto:infrastructure-bounces@xxxxxxxxxxxxxxxxxxxxxxx] On Behalf Of Ricky Zhou
Sent: Friday, May 20, 2011 1:10 AM
To: infrastructure@xxxxxxxxxxxxxxxxxxxxxxx
Subject: Re: [Change Request] Have spins.fp.o build from different branch
On 2011-05-19 02:57:16 PM, Sijis Aviles wrote:
> Hi all,
>
> We need to change our current build for spins.fp.o since its pulling
> from the incorrect branch. The reason for this request is so that we
> can update the master branch for the upcoming release, otherwise,
> we'll have to do them the morning of the release.
>
> Let me know if this is possible with 2 +1's.
>
> -------
> diff --git a/modules/fedora-web/files/syncStatic.sh
> b/modules/fedora-web/files/ index f6549cc..c9ae63a 100644
> --- a/modules/fedora-web/files/syncStatic.sh
> +++ b/modules/fedora-web/files/syncStatic.sh
> @@ -50,12 +50,12 @@ cd fedora-web
> /usr/bin/git checkout -q origin/f15-beta || exit 1
>
> build fedoraproject.org
> +build spins.fedoraproject.org
>
> # Make sure everything else builds from master.
> /usr/bin/git reset --hard -q || exit 1
> /usr/bin/git checkout -q master || exit 1
>
> -build spins.fedoraproject.org
> build boot.fedoraproject.org
> build fedoracommunity.org
> build start.fedoraproject.org
> --------
+1
Thanks,
Ricky
infrastructure mailing list
infrastructure@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/infrastructure
_______________________________________________ infrastructure mailing list infrastructure@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/infrastructure
