#888 websites: remove obsolete sites from build script & use main branch
Merged 2 years ago by kevin. Opened 2 years ago by darknao.
fedora-infra/ darknao/ansible mirrors  into  main

@@ -45,22 +45,17 @@ 

  

  /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 spins.fedoraproject.org

  build fedoracommunity.org

  build start.fedoraproject.org

- #build fedoraproject.org

@@ -51,21 +51,15 @@ 

  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

remove mirrors.fedoraproject.org from the build script since it has been replaced by mirror-manager a long time ago.

rebased onto 35f89271d58e5901df7dad44f0fbb8aa8f2b0be0

2 years ago

rebased onto 6231d8f

2 years ago

rebased onto 6231d8f

2 years ago

Pull-Request has been merged by kevin

2 years ago