From d5bce6b2286f9210030834271d343000777efbd7 Mon Sep 17 00:00:00 2001
From: Tom Seddon <modelb@bbcmicro.com>
Date: Wed, 5 Sep 2018 13:41:32 +0100
Subject: [PATCH] Always upload builds to GitHub releases. Retire the rolling
 builds site.

---
 .travis.yml  |  9 ---------
 README.md    | 11 +----------
 appveyor.yml | 11 -----------
 3 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 07c9a5ac..e0acc662 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,10 +3,6 @@ sudo: false
 os: osx
 osx_image: xcode9.2
 
-env:
-  global:
-  - secure: z70ZSe8gw9m+680CODuuWpTyr9jBzcsF2hlneZdYNGAKUwzWMavrZYbaxoTlDB239/GE9BAypshucft5U0G89S1oOx8TGR5fbabs7hiUU+W5LRarMuESyCSlkk6zRB0Hl1HOQaPoHEM0TOXTXjn0LF7diu7KK+f/Rafce4pZM1gbUW+kOjVgpk+m7NBg9aUrhM0PGT39pfb+ES/zgihxpfQQu9Tg0vfqwVRzamCs3+0xjX2hfEEwTK+PEgrcxUdscrdkcXqv9Ly/CYDmGGwPuyrJfkaaIQgVmPuslnDPpIYaUq2FmJtdIUT6AnrMeU7gY5peHdACa/UCRwqC/IB+Flamv9afKWAvRu5WpHKSCd04+Phq4A0Y1s9YRhqVFIy9xRWHdSMUX23HmeP/BXT+Z/BulZIcXjUWrmcFuVJY9lvRcQ4Vc1+7ERmPrk7Ckyl+3EEM3ARLOWgddH6rhOk1rnQE1avqxNK9PU3t9gvj1Tsm5vaRDix+o+VcICv8/DaglxAIs+eZZhgGkxY+7i9M/1y5Sr9qpNfTjEgZ7QfoGLZ8WcdxfUgY2rjm4r8C2BPx1P5lSy9H8xZ54NeQkK9aLUTGBtF5OL3Sa06ZbVuchxeygizzieZ/SRM2Qgx5ybTn8+sdGd4nfq1pHgf+Gh8aUqxbKDPiSF6WE7tspFNrdD4=
-
 branches:
   only:
     - master
@@ -34,10 +30,5 @@ deploy:
       secure: r/uHB0E2ZQXdlakXeEISZdZD8K4WLkptyaYouPXG2xFLFZAgosuBkComk8uPkM4YH/qOo+7zHptELft8yO9uinil1IAWKmz6gxX6TrLQkdUWQThgRr0Vw5iLwymFr6MeESZ2G8jqc6CAw2YQJqhGhOU9AO5gvKfHFItrrVtoF+EOdRCd9w1wYUcH20uY0rGXD7vx6JmEpS1S48dDDr2XlAel368M1o3cjtaYo23uiW4K+21XMPCdK91Dz6fvnDXibnMTnOHmWGKIVp0lBow5R91a9ywHDmzNgyrEw+dmjAuMFtV3q05B8Wd5zg9zGAOt3dqkEdepvV+x9yqT1WXMg3t89x3gwKBPfrHIMPXDhDAg5iIDxi9L29XqvvZLExQIqQxDGQxRjAP2IinHfBsTBvBZAOA7gBVMDYppNTVOGU8FCxu3OGq9/CBlSQlgltZANDjboOexcc3abrNBhIvr0Fw7aE5YmCmwbIwmj+IQi2wmCsn1+o9jSACkm8h7k9mGuhw5LxvArZbu5W+Ka/wiTgXZnp3BcPaTMFLoMcoycY4DvweVLeALBg5esTbBsNbcxdHkOicwh8kwZIMCEes71WguXZV8fBoUsTn9GqzLY0MG3LQL7/RPobLBY+vdwrFb5zMEeuQCHu2uFXDUYbzfpTdE/ViXyUsqulajBbO5aGg=
     file: ${OUTPUT_NAME}
     skip_cleanup: true
-    on:
-      branch: build
-  - provider: script
-    script: ftp -u ftp://b2_upload:${FFE3_PASSWORD}@ffe3.com/ffe3.com/b2/ci/${OUTPUT_BASENAME} ${OUTPUT_NAME}
     on:
       branch: master
-    skip_cleanup: true
diff --git a/README.md b/README.md
index a2733fd5..e933b7f9 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ If you have trouble with slow startup and poor performance on Windows
 option: `b2 --timer`.
 
 This setting is sticky, and will be saved on exit for future runs. So
-after you've done this one, you can just run it from Windows Explorer
+after you've done this once, you can just run it from Windows Explorer
 in future.
 
 ## OS X
@@ -40,15 +40,6 @@ there.
 
 Please follow [the building instructions](#building).
 
-## Rolling builds
-
-You can get a Windows or OS X build of the latest buildable code, hot
-off the presses, for good or for ill, from the
-[b2 builds site](http://ffe3.com/b2/ci/).
-
-The builds are sorted newest first, so grab the top one for the
-system of interest, and install as above!
-
 # Guided tour
 
 Double-click the icon: `b2` on OS X, `b2.exe` on 64-bit Windows, or
diff --git a/appveyor.yml b/appveyor.yml
index 4089d1f2..2c4d5bf7 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,7 +3,6 @@ version: '{build}'
 branches:
   only:
     - master
-    - build
 
 image: Visual Studio 2015
 
@@ -34,15 +33,5 @@ deploy:
     artifact: output
     draft: false
     prerelease: false
-    on:
-      branch: build
-  - provider: FTP
-    protocol: sftp
-    host: ffe3.com
-    username: b2_upload
-    password:
-      secure: QxgHPePBfViWoQw+N8f1YU1hRmya/AbC9+XCP2gRLaI=
-    folder: ffe3.com/b2/ci
-    artifact: output
     on:
       branch: master