From 6231d8fd254f4e2075e002a7f7d3d1b56c2105bb Mon Sep 17 00:00:00 2001 From: Francois Andrieu Date: Tue, 23 Nov 2021 18:52:05 +0100 Subject: [PATCH] websites: remove obsolete sites from build script & use main branch --- roles/fedora-web/build/files/syncStatic.sh | 12 +++--------- roles/fedora-web/build/files/syncStatic.stg.sh | 10 ++-------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/roles/fedora-web/build/files/syncStatic.sh b/roles/fedora-web/build/files/syncStatic.sh index 9a1484e9b0..67d9a993f2 100644 --- a/roles/fedora-web/build/files/syncStatic.sh +++ b/roles/fedora-web/build/files/syncStatic.sh @@ -45,22 +45,17 @@ cd /srv/web/fedora-websites /usr/bin/git clean -q -fdx || exit 1 /usr/bin/git reset -q --hard || exit 1 -/usr/bin/git checkout -q master || exit 1 +/usr/bin/git checkout -q main || exit 1 /usr/bin/git pull -q --ff-only || exit 1 build labs.fedoraproject.org build arm.fedoraproject.org -#build getfedora.org build alt.fedoraproject.org -pushd mirrors.fedoraproject.org > /dev/null -rsync -qa --delete-after --delay-updates . /srv/web/mirrors.fedoraproject.org/ -popd > /dev/null - -# Make sure everything else builds from master. +# Make sure everything else builds from main. /usr/bin/git clean -q -fdx || exit 1 /usr/bin/git reset -q --hard || exit 1 -/usr/bin/git checkout -q master || exit 1 +/usr/bin/git checkout -q main || exit 1 /usr/bin/git pull -q --ff-only || exit 1 @@ -68,4 +63,3 @@ build flocktofedora.org build spins.fedoraproject.org build fedoracommunity.org build start.fedoraproject.org -#build fedoraproject.org diff --git a/roles/fedora-web/build/files/syncStatic.stg.sh b/roles/fedora-web/build/files/syncStatic.stg.sh index eb68f3a340..7322bec8a1 100644 --- a/roles/fedora-web/build/files/syncStatic.stg.sh +++ b/roles/fedora-web/build/files/syncStatic.stg.sh @@ -51,21 +51,15 @@ cd /srv/web/fedora-websites build labs.fedoraproject.org build spins.fedoraproject.org build arm.fedoraproject.org -#build getfedora.org build alt.fedoraproject.org -pushd mirrors.fedoraproject.org > /dev/null -rsync -qa --delete-after --delay-updates . /srv/web/mirrors.fedoraproject.org/ -popd > /dev/null - -# Make sure everything else builds from master. +# Make sure everything else builds from main. /usr/bin/git clean -q -fdx || exit 1 /usr/bin/git reset -q --hard || exit 1 -/usr/bin/git checkout -q master || exit 1 +/usr/bin/git checkout -q main || exit 1 /usr/bin/git pull -q --ff-only || exit 1 build flocktofedora.org build fedoracommunity.org build start.fedoraproject.org -#build fedoraproject.org