From 04e3730ba646c835df59941a31e1dc10144bdd1b Mon Sep 17 00:00:00 2001
From: Chris Fallin <chris@cfallin.org>
Date: Wed, 2 Dec 2020 09:58:12 -0800
Subject: [PATCH] Update to a CentOS 7 docker container for binary compatible
 builds.

CentOS 6 just went EOL at the end of November 2020; as of today, the
repository seems to have disappeared, so our CI builds are failing. This
PR updates us to CentOS 7, which should be usable until June 30, 2024.
---
 .github/actions/binary-compatible-builds/main.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/actions/binary-compatible-builds/main.js b/.github/actions/binary-compatible-builds/main.js
index 4af9bc7ac2..d2d774f4eb 100755
--- a/.github/actions/binary-compatible-builds/main.js
+++ b/.github/actions/binary-compatible-builds/main.js
@@ -41,7 +41,6 @@ if (process.env.CENTOS !== undefined) {
 let path = process.env.PATH;
 path = `${path}:/rust/bin`;
 path = `/opt/rh/devtoolset-8/root/usr/bin:${path}`;
-path = `/opt/rh/rh-python36/root/usr/bin:${path}`;
 
 // Spawn a container daemonized in the background which we'll connect to via
 // `docker exec`. This'll have access to the current directory.
@@ -52,7 +51,7 @@ child_process.execFileSync('docker', [
   '-v', `${process.cwd()}:${process.cwd()}`,
   '-v', `${child_process.execSync('rustc --print sysroot').toString().trim()}:/rust:ro`,
   '--env', `PATH=${path}`,
-  'centos:6',
+  'centos:7',
 ], stdio);
 
 // Use ourselves to run future commands
@@ -63,7 +62,7 @@ const exec = s => {
   child_process.execSync(`docker exec centos ${s}`, stdio);
 };
 exec('yum install -y centos-release-scl cmake xz epel-release');
-exec('yum install -y rh-python36 patchelf unzip');
+exec('yum install -y python3 patchelf unzip');
 exec('yum install -y devtoolset-8-gcc devtoolset-8-binutils devtoolset-8-gcc-c++');
 exec('yum install -y git');