summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEbrahim Byagowi <ebrahim@gnu.org>2018-11-29 23:57:50 +0330
committerGitHub <noreply@github.com>2018-11-29 23:57:50 +0330
commitb65645bbafb3f1f9f956df3028cf4479a4bdc265 (patch)
tree122b8e031429bf9c90fdc543a7ea62b70d7e5cef
parente7bd29ea11bd6301a332b471120a4a2cd8575d09 (diff)
downloadharfbuzz-b65645bbafb3f1f9f956df3028cf4479a4bdc265.tar.gz
[ci] Re-enable llvm-gcc-4.2 bots (#1429)
-rw-r--r--.circleci/config.yml48
1 files changed, 24 insertions, 24 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 320813ad..e6a5a1d1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -22,28 +22,28 @@ jobs:
- run: make -j4
- run: make check || .ci/fail.sh
- # macos-llvm-gcc-4.2:
- # macos:
- # xcode: "8.3.3"
- # steps:
- # - checkout
- # - run: HOMEBREW_NO_AUTO_UPDATE=1 brew install wget pkg-config libtool ragel freetype glib cairo
- # - run: wget https://packages.macports.org/llvm-gcc42/llvm-gcc42-2336.11_3+universal.darwin_15.i386-x86_64.tbz2 && tar zxvf llvm-gcc42-2336.11_3+universal.darwin_15.i386-x86_64.tbz2
- # - run: CC=$PWD/opt/local/bin/llvm-gcc-4.2 CXX=$PWD/opt/local/bin/llvm-g++-4.2 ./autogen.sh --with-freetype --with-glib --with-gobject --with-cairo
- # # Ignoring assembler complains, https://stackoverflow.com/a/39867021
- # - run: make 2>&1 | grep -v -e '^/var/folders/*' -e '^[[:space:]]*\.section' -e '^[[:space:]]*\^[[:space:]]*~*'
- # - run: make check || .ci/fail.sh
-
- # macos-notest-apple-gcc-i686-4.2:
- # macos:
- # xcode: "8.3.3"
- # steps:
- # - checkout
- # - run: HOMEBREW_NO_AUTO_UPDATE=1 brew install wget pkg-config libtool ragel
- # - run: wget https://packages.macports.org/apple-gcc42/apple-gcc42-5666.3_15+universal.darwin_15.i386-x86_64.tbz2 && tar zxvf apple-gcc42-5666.3_15+universal.darwin_15.i386-x86_64.tbz2
- # - run: CPP=$PWD/opt/local/bin/i686-apple-darwin15-cpp-apple-4.2.1 CC=$PWD/opt/local/bin/i686-apple-darwin15-gcc-apple-4.2.1 CXX=$PWD/opt/local/bin/i686-apple-darwin15-g++-apple-4.2.1 ./autogen.sh
- # # Ignoring assembler complains, https://stackoverflow.com/a/39867021
- # - run: make 2>&1 | grep -v -e '^/var/folders/*' -e '^[[:space:]]*\.section' -e '^[[:space:]]*\^[[:space:]]*~*'
+ macos-llvm-gcc-4.2:
+ macos:
+ xcode: "8.3.3"
+ steps:
+ - checkout
+ - run: HOMEBREW_NO_AUTO_UPDATE=1 brew install wget pkg-config libtool ragel freetype glib cairo
+ - run: wget https://packages.macports.org/llvm-gcc42/llvm-gcc42-2336.11_3+universal.darwin_15.i386-x86_64.tbz2 && tar zxvf llvm-gcc42-2336.11_3+universal.darwin_15.i386-x86_64.tbz2
+ - run: CC=$PWD/opt/local/bin/llvm-gcc-4.2 CXX=$PWD/opt/local/bin/llvm-g++-4.2 ./autogen.sh --with-freetype --with-glib --with-gobject --with-cairo
+ # Ignoring assembler complains, https://stackoverflow.com/a/39867021
+ - run: make 2>&1 | grep -v -e '^/var/folders/*' -e '^[[:space:]]*\.section' -e '^[[:space:]]*\^[[:space:]]*~*'
+ - run: make check || .ci/fail.sh
+
+ macos-notest-apple-gcc-i686-4.2:
+ macos:
+ xcode: "8.3.3"
+ steps:
+ - checkout
+ - run: HOMEBREW_NO_AUTO_UPDATE=1 brew install wget pkg-config libtool ragel
+ - run: wget https://packages.macports.org/apple-gcc42/apple-gcc42-5666.3_15+universal.darwin_15.i386-x86_64.tbz2 && tar zxvf apple-gcc42-5666.3_15+universal.darwin_15.i386-x86_64.tbz2
+ - run: CPP=$PWD/opt/local/bin/i686-apple-darwin15-cpp-apple-4.2.1 CC=$PWD/opt/local/bin/i686-apple-darwin15-gcc-apple-4.2.1 CXX=$PWD/opt/local/bin/i686-apple-darwin15-g++-apple-4.2.1 ./autogen.sh
+ # Ignoring assembler complains, https://stackoverflow.com/a/39867021
+ - run: make 2>&1 | grep -v -e '^/var/folders/*' -e '^[[:space:]]*\.section' -e '^[[:space:]]*\^[[:space:]]*~*'
macos-notest-ios:
macos:
@@ -321,8 +321,8 @@ workflows:
# macOS
- macos-10.12.6-aat-fonts
- macos-10.13.6-aat-fonts
- #- macos-llvm-gcc-4.2
- #- macos-notest-apple-gcc-i686-4.2
+ - macos-llvm-gcc-4.2
+ - macos-notest-apple-gcc-i686-4.2
- macos-notest-ios
# both autotools and cmake