More fallout from master->main

Author: mattgodbolt

CONTRIBUTING.md

@@ -24,4 +24,4 @@ is a mess. Hopefully this will change with time, and ideas to improve it are wel
   to `/opt/compiler-explorer/...`.
 * Submit a Pull Request.
 
-If you have any questions, don't hesitate: [Contact us](https://github.com/mattgodbolt/compiler-explorer/blob/master/README.md#contact-us).
+If you have any questions, don't hesitate: [Contact us](https://github.com/mattgodbolt/compiler-explorer/blob/main/README.md#contact-us).

admin/503.html

@@ -10,8 +10,8 @@
     <meta property="og:title" content="Compiler Explorer">
     <meta name="twitter:card" content="summary">
     <meta name="twitter:site" content="@CompileExplore">
-    <meta property="og:image" content="https://github.com/compiler-explorer/infra/blob/master/logo/favicon.png?raw=true">
-    <meta property="og:image:secure_url" content="https://github.com/compiler-explorer/infra/blob/master/logo/favicon.png?raw=true">
+    <meta property="og:image" content="https://github.com/compiler-explorer/infra/blob/main/logo/favicon.png?raw=true">
+    <meta property="og:image:secure_url" content="https://github.com/compiler-explorer/infra/blob/main/logo/favicon.png?raw=true">
     <meta property="og:image:type" content="image/png">
     <meta property="og:image:width" content="145">
     <meta property="og:image:height" content="145">

admin/builds.html

@@ -7,7 +7,7 @@
     <script src="knockout.simpleGrid.3.0.js"></script>
     <script src="builds.js"></script>
     <link rel="icon" type="image/png"
-          href="https://github.com/compiler-explorer/infra/blob/master/logo/favicon.png?raw=true"/>
+          href="https://github.com/compiler-explorer/infra/blob/main/logo/favicon.png?raw=true"/>
     <style>
         html, body {
             background-color: #EEEEEE;

admin/libraries.html

@@ -6,7 +6,7 @@
     <script src="knockout-3.4.2.js"></script>
     <script src="knockout.simpleGrid.3.0.js"></script>
     <link rel="icon" type="image/png"
-          href="https://github.com/compiler-explorer/infra/blob/master/logo/favicon.png?raw=true"/>
+          href="https://github.com/compiler-explorer/infra/blob/main/logo/favicon.png?raw=true"/>
     <style>
         html, body {
             background-color: #EEEEEE;

bin/lib/amazon.py

@@ -181,7 +181,7 @@ def get_current_key(args):
 
 def get_all_current():
     versions = []
-    for branch in ['release', 'beta', 'master']:
+    for branch in ['release', 'beta', 'main', 'master']:  # TODO, remove master and the builds therein
         try:
             o = s3_client.get_object(
                 Bucket='compiler-explorer',

bin/lib/amazon_properties.py

@@ -24,7 +24,7 @@ def get_properties_compilers_and_libraries(language, logger):
     _libraries = defaultdict(lambda: [])
 
     encoded_language = urllib.parse.quote(language)
-    url = f'https://raw.githubusercontent.com/compiler-explorer/compiler-explorer/master/etc/config/{encoded_language}.amazon.properties'
+    url = f'https://raw.githubusercontent.com/compiler-explorer/compiler-explorer/main/etc/config/{encoded_language}.amazon.properties'
     lines = []
     with tempfile.TemporaryFile() as fd:
         request = requests.get(url, stream=True)

bin/lib/ce.py

@@ -430,13 +430,17 @@ def builds_set_current_cmd(args):
 
 def builds_rm_old_cmd(args):
     current = get_all_current()
-    all_releases = get_releases()
-    max_build = max(x.version for x in all_releases)
+    max_builds = {}
+    for release in get_releases():
+        if release.version not in max_builds:
+            max_builds[release.version.source] = release.version
+        else:
+            max_builds[release.version.source] = max(release.version, max_builds[release.version.source])
     for release in get_releases():
         if release.key in current:
             print("Skipping {} as it is a current version".format(release))
         else:
-            age = max_build - release.version
+            age = max_builds[release.version.source].number - release.version.number
             if age > args['age']:
                 if args['dry_run']:
                     print("Would remove build {}".format(release))

packer-local.json

@@ -44,7 +44,7 @@
         "apt-get -y update",
         "apt-get -y install git sudo curl rsyslog psmisc systemd",
         "cd /infra",
-        "env PACKER_SETUP=yes bash setup.sh --updated master 2>&1 | tee /tmp/setup.log"
+        "env PACKER_SETUP=yes bash setup.sh --updated main 2>&1 | tee /tmp/setup.log"
       ]
     }
   ]

packer.json

@@ -42,7 +42,7 @@
   ],
 
   "variables": {
-    "BRANCH": "master",
+    "BRANCH": "main",
     "MY_ACCESS_KEY": "",
     "MY_SECRET_KEY": ""
   },

windows/Msvce.psm1

@@ -150,7 +150,7 @@ then pass this to only do a build of the existing output directory.
 .PARAMETER GitCommit
 
 The specific hash of compiler-explorer to use for building the image. Use
-'master' for the latest on github. Any value is okay to use for testing, but
+'main' for the latest on github. Any value is okay to use for testing, but
 images uploaded to production server need to be registered with
 https://ossmsft.visualstudio.com/_oss
 

windows/files/cookie_policy.html

@@ -15,7 +15,7 @@ <h2>Compiler Explorer Cookie Policy</h2>
     We follow the Microsoft privacy policy found at 
     <a href="http://privacy.microsoft.com" target="_blank" rel="noreferrer noopener">http://privacy.microsoft.com</a>
     as well as the privacy policy found in the main Compiler Explorer
-    <a href="https://github.com/mattgodbolt/compiler-explorer/blob/master/static/policies/" target="_blank"
+    <a href="https://github.com/mattgodbolt/compiler-explorer/blob/main/static/policies/" target="_blank"
         rel="noreferrer noopener">GitHub project page</a>
 </p>
 

windows/files/privacy_policy.html

@@ -15,15 +15,15 @@ <h2>Compiler Explorer Privacy Policy</h2>
     Your privacy is important to us, we follow the Microsoft privacy policy found at 
     <a href="http://privacy.microsoft.com" target="_blank" rel="noreferrer noopener">http://privacy.microsoft.com</a>
     as well as the privacy policy found in the main Compiler Explorer
-    <a href="https://github.com/mattgodbolt/compiler-explorer/blob/master/static/policies/" target="_blank"
+    <a href="https://github.com/mattgodbolt/compiler-explorer/blob/main/static/policies/" target="_blank"
         rel="noreferrer noopener">GitHub project page</a>
 </p>
 
 <p>
     Compiler Explorer was created by and is primarily administrated by
     <a href="mailto:[email protected]">Matt Godbolt</a>,
     along with a number of volunteers (including, but not limited to those listed in our "<a
-        href="https://github.com/mattgodbolt/compiler-explorer/blob/master/AUTHORS.md" target="_blank"
+        href="https://github.com/mattgodbolt/compiler-explorer/blob/main/AUTHORS.md" target="_blank"
         rel="noreferrer noopener">Authors</a>" documentation).
     It is run on a best-effort basis, and is not a commercial product. We do our best
     to keep your data safe, but welcome help from the community: See our