From 40c8fb1f0f2174167489a6bac0f91609f3f43a8f Mon Sep 17 00:00:00 2001 From: Wez Furlong Date: Thu, 19 Aug 2021 21:31:46 -0700 Subject: [PATCH] ci: prep devtoolset 9 with SCL repo --- .github/workflows/gen_centos7.yml | 3 +++ .github/workflows/gen_centos7_continuous.yml | 7 +++++++ .github/workflows/gen_centos7_tag.yml | 3 +++ ci/generate-workflows.py | 6 ++++++ 4 files changed, 19 insertions(+) diff --git a/.github/workflows/gen_centos7.yml b/.github/workflows/gen_centos7.yml index 9b838e6d6..28c62df85 100644 --- a/.github/workflows/gen_centos7.yml +++ b/.github/workflows/gen_centos7.yml @@ -23,6 +23,9 @@ jobs: runs-on: "ubuntu-latest" container: "centos:7" steps: + - name: "Install SCL" + shell: bash + run: "yum install -y centos-release-scl-rh" - name: "Update compiler" shell: bash run: "yum install -y devtoolset-9-gcc devtoolset-9-gcc-c++" diff --git a/.github/workflows/gen_centos7_continuous.yml b/.github/workflows/gen_centos7_continuous.yml index d76e702ac..91882880c 100644 --- a/.github/workflows/gen_centos7_continuous.yml +++ b/.github/workflows/gen_centos7_continuous.yml @@ -25,6 +25,13 @@ jobs: runs-on: "ubuntu-latest" container: "centos:7" steps: + - name: "Install SCL" + shell: bash + run: | + export BUILD_REASON=Schedule + yum install -y centos-release-scl-rh + + - name: "Update compiler" shell: bash run: | diff --git a/.github/workflows/gen_centos7_tag.yml b/.github/workflows/gen_centos7_tag.yml index 772344ec7..2d0e7e737 100644 --- a/.github/workflows/gen_centos7_tag.yml +++ b/.github/workflows/gen_centos7_tag.yml @@ -14,6 +14,9 @@ jobs: runs-on: "ubuntu-latest" container: "centos:7" steps: + - name: "Install SCL" + shell: bash + run: "yum install -y centos-release-scl-rh" - name: "Update compiler" shell: bash run: "yum install -y devtoolset-9-gcc devtoolset-9-gcc-c++" diff --git a/ci/generate-workflows.py b/ci/generate-workflows.py index dfe0942cb..b24d3b24a 100755 --- a/ci/generate-workflows.py +++ b/ci/generate-workflows.py @@ -155,6 +155,12 @@ class Target(object): def install_newer_compiler(self): steps = [] if self.name == "centos7": + steps.append( + RunStep( + "Install SCL", + "yum install -y centos-release-scl-rh", + ) + ) steps.append( RunStep( "Update compiler",