Merge pull request #1975 from realm/ez/devtoolset

Update devtoolset from 3 to 6
This commit is contained in:
Emanuele Zattin 2018-08-22 22:57:36 +02:00 committed by GitHub
commit 3389d2d141
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions

View File

@ -1,4 +1,4 @@
2.15.0 Release notes (YYYY-MM-DD)
X.Y.Z Release notes (YYYY-MM-DD)
=============================================================
### Compatibility
* Sync protocol: 24
@ -26,6 +26,7 @@
* Updated to Object Store commit: 97fd03819f398b3c81c8b007feaca8636629050b
* Updated external packages with help from `npm audit`.
* Upgraded to Realm Sync v3.8.11.
* Upgraded to devtoolset-6 on Centos for Linux builds.
2.14.2 Release notes (2018-8-8)

View File

@ -20,9 +20,9 @@ RUN touch /var/lib/rpm/* \
which \
chrpath \
openssl-devel \
devtoolset-3-gcc \
devtoolset-3-gcc-c++ \
devtoolset-3-binutils \
devtoolset-6-gcc \
devtoolset-6-gcc-c++ \
devtoolset-6-binutils \
libconfig-devel \
jq \
&& yum remove -y g++ gcc \

View File

@ -1,3 +1,3 @@
#!/bin/bash
scl enable devtoolset-3 -- "$@"
scl enable devtoolset-6 -- "$@"