diff --git a/.ci/provision/centos_7.sh b/.ci/provision/centos_7.sh index 5ee55d5f2..c45a6924d 100755 --- a/.ci/provision/centos_7.sh +++ b/.ci/provision/centos_7.sh @@ -4,8 +4,8 @@ set -ex # CentOS 7 comes with GCC 4.8.5 which does not fully support C++14, so we need # a newer toolchain. sudo yum install -y centos-release-scl -sudo yum install -y devtoolset-10 -source /opt/rh/devtoolset-10/enable +sudo yum install -y devtoolset-9 +source /opt/rh/devtoolset-9/enable # Install prerequisites sudo yum install -y \ diff --git a/firezone/omnibus/config/patches/pkg-config/openbsd-charset.patch b/omnibus/config/patches/pkg-config/openbsd-charset.patch similarity index 100% rename from firezone/omnibus/config/patches/pkg-config/openbsd-charset.patch rename to omnibus/config/patches/pkg-config/openbsd-charset.patch diff --git a/omnibus/config/software/zlib.rb b/omnibus/config/software/zlib.rb index 1addf87f8..75db045d7 100644 --- a/omnibus/config/software/zlib.rb +++ b/omnibus/config/software/zlib.rb @@ -1,5 +1,5 @@ # -# Copyright 2012-2018 Chef Software, Inc. +#Copyright 2012-2018 Chef Software, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License.