Hi,
The Website team has been working feverishly in getting the new website [1] up and going for F14. In order not to complicate things during GA, we are planning to release the website tomorrow morning around 10 AM CT.
I'm hoping you guys could review this and give me a couple of thumbs up for this.
--- diff --git a/modules/fedora-web/files/syncStatic.sh b/modules/fedora-web/files/syncStatic.sh index 9967fc4..eddc1a0 100644 --- a/modules/fedora-web/files/syncStatic.sh +++ b/modules/fedora-web/files/syncStatic.sh @@ -22,7 +22,7 @@ trap "cd /tmp ; rm -rf $TEMP" EXIT # Good luck!
cd fedora-web -/usr/bin/git checkout -q origin/f14-beta || exit 1 +/usr/bin/git checkout -q master || exit 1
pushd fedoraproject.org > /dev/null make > /dev/null 2>&1 @@ -30,8 +30,8 @@ rsync -qa --delete-after --delay-updates out/ /srv/web/ fedoraproject.org/ popd > /dev/null
# Make sure everything else builds from master. -/usr/bin/git reset --hard -q || exit 1 -/usr/bin/git checkout -q master || exit 1 +#/usr/bin/git reset --hard -q || exit 1 +#/usr/bin/git checkout -q master || exit 1
pushd spins.fedoraproject.org > /dev/null make > /dev/null 2>&1 ---
Thanks,
Sijis
On Tue, Oct 26, 2010 at 21:26, Sijis Aviles sijis@fedoraproject.org wrote:
Hi,
The Website team has been working feverishly in getting the new website [1] up and going for F14. In order not to complicate things during GA, we are planning to release the website tomorrow morning around 10 AM CT.
I'm hoping you guys could review this and give me a couple of thumbs up for this.
To confirm the intent:
1) Stop checking out origin/f14-beta 2) Check out the master tree 3) turn off a git checkout hard from master.
diff --git a/modules/fedora-web/files/syncStatic.sh b/modules/fedora-web/files/syncStatic.sh index 9967fc4..eddc1a0 100644 --- a/modules/fedora-web/files/syncStatic.sh +++ b/modules/fedora-web/files/syncStatic.sh @@ -22,7 +22,7 @@ trap "cd /tmp ; rm -rf $TEMP" EXIT # Good luck!
cd fedora-web -/usr/bin/git checkout -q origin/f14-beta || exit 1 +/usr/bin/git checkout -q master || exit 1
pushd fedoraproject.org > /dev/null make > /dev/null 2>&1 @@ -30,8 +30,8 @@ rsync -qa --delete-after --delay-updates out/ /srv/web/fedoraproject.org/ popd > /dev/null
# Make sure everything else builds from master. -/usr/bin/git reset --hard -q || exit 1 -/usr/bin/git checkout -q master || exit 1 +#/usr/bin/git reset --hard -q || exit 1 +#/usr/bin/git checkout -q master || exit 1
pushd spins.fedoraproject.org > /dev/null make > /dev/null 2>&1
Thanks,
Sijis
[1] - http://stg.fedoraproject.org
infrastructure mailing list infrastructure@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/infrastructure
On Tue, Oct 26, 2010 at 10:30 PM, Stephen John Smoogen smooge@gmail.comwrote:
On Tue, Oct 26, 2010 at 21:26, Sijis Aviles sijis@fedoraproject.org wrote:
Hi,
The Website team has been working feverishly in getting the new website
[1]
up and going for F14. In order not to complicate things during GA, we are planning to release the website tomorrow morning around 10 AM CT.
I'm hoping you guys could review this and give me a couple of thumbs up
for
this.
To confirm the intent:
- Stop checking out origin/f14-beta
- Check out the master tree
- turn off a git checkout hard from master.
You got it.
Since the other sites are also pulling from master, it doesn't make sense to re-checkout the same branch.
Sijis
On Tue, Oct 26, 2010 at 21:30, Stephen John Smoogen smooge@gmail.com wrote:
On Tue, Oct 26, 2010 at 21:26, Sijis Aviles sijis@fedoraproject.org wrote:
Hi,
The Website team has been working feverishly in getting the new website [1] up and going for F14. In order not to complicate things during GA, we are planning to release the website tomorrow morning around 10 AM CT.
I'm hoping you guys could review this and give me a couple of thumbs up for this.
To confirm the intent:
- Stop checking out origin/f14-beta
- Check out the master tree
- turn off a git checkout hard from master.
Ok thanks. +1
On 2010-10-26 10:26:00 PM, Sijis Aviles wrote:
diff --git a/modules/fedora-web/files/syncStatic.sh b/modules/fedora-web/files/ syncStatic.sh index 9967fc4..eddc1a0 100644 --- a/modules/fedora-web/files/syncStatic.sh +++ b/modules/fedora-web/files/syncStatic.sh @@ -22,7 +22,7 @@ trap "cd /tmp ; rm -rf $TEMP" EXIT # Good luck! cd fedora-web -/usr/bin/git checkout -q origin/f14-beta || exit 1 +/usr/bin/git checkout -q master || exit 1 pushd fedoraproject.org > /dev/null make > /dev/null 2>&1 @@ -30,8 +30,8 @@ rsync -qa --delete-after --delay-updates out/ /srv/web/ fedoraproject.org/ popd > /dev/null # Make sure everything else builds from master. -/usr/bin/git reset --hard -q || exit 1 -/usr/bin/git checkout -q master || exit 1 +#/usr/bin/git reset --hard -q || exit 1 +#/usr/bin/git checkout -q master || exit 1 pushd spins.fedoraproject.org > /dev/null make > /dev/null 2>&1
+1
Thanks, Ricky
On Tuesday, October 26, 2010 10:31:34 pm Ricky Zhou wrote:
On 2010-10-26 10:26:00 PM, Sijis Aviles wrote:
diff --git a/modules/fedora-web/files/syncStatic.sh b/modules/fedora-web/files/ syncStatic.sh index 9967fc4..eddc1a0 100644 --- a/modules/fedora-web/files/syncStatic.sh +++ b/modules/fedora-web/files/syncStatic.sh @@ -22,7 +22,7 @@ trap "cd /tmp ; rm -rf $TEMP" EXIT # Good luck!
cd fedora-web -/usr/bin/git checkout -q origin/f14-beta || exit 1 +/usr/bin/git checkout -q master || exit 1
pushd fedoraproject.org > /dev/null make > /dev/null 2>&1 @@ -30,8 +30,8 @@ rsync -qa --delete-after --delay-updates out/ /srv/web/ fedoraproject.org/ popd > /dev/null
# Make sure everything else builds from master. -/usr/bin/git reset --hard -q || exit 1 -/usr/bin/git checkout -q master || exit 1 +#/usr/bin/git reset --hard -q || exit 1 +#/usr/bin/git checkout -q master || exit 1
pushd spins.fedoraproject.org > /dev/null make > /dev/null 2>&1
+1
Thanks, Ricky
+1
Dennis
infrastructure@lists.fedoraproject.org
-
Dennis Gilmore -
Ricky Zhou -
Sijis Aviles -
Stephen John Smoogen