Switch to gcc9.2 and xcode11.2 for MacOS builds (#246)

This commit is contained in:
Matthias J. Kannwischer 2019-10-23 07:59:59 +02:00 committed by GitHub
parent 54d6301eea
commit e6ec07bcf9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -4,7 +4,7 @@ matrix:
include: include:
- name: "KEMs: MacOS + Clang" - name: "KEMs: MacOS + Clang"
os: osx os: osx
osx_image: xcode10.2 osx_image: xcode11.2
compiler: clang compiler: clang
before_install: before_install:
- pip3 install -r requirements.txt - pip3 install -r requirements.txt
@ -25,15 +25,15 @@ matrix:
homebrew: homebrew:
packages: packages:
- astyle - astyle
- name: "KEMs: MacOS + GCC8" - name: "KEMs: MacOS + GCC9"
os: osx os: osx
osx_image: xcode10.2 osx_image: xcode11.2
compiler: gcc compiler: gcc
addons: addons:
homebrew: homebrew:
packages: packages:
- astyle - astyle
- gcc@8 - gcc@9
env: env:
PQCLEAN_ONLY_TYPES: kem PQCLEAN_ONLY_TYPES: kem
PQCLEAN_ONLY_DIFF: 1 PQCLEAN_ONLY_DIFF: 1
@ -47,14 +47,14 @@ matrix:
- pip3 install -r requirements.txt - pip3 install -r requirements.txt
- brew link gcc - brew link gcc
- export PATH="/usr/local/bin:$PATH" - export PATH="/usr/local/bin:$PATH"
- ln -s /usr/local/bin/gcc-8 /usr/local/bin/gcc - ln -s /usr/local/bin/gcc-9 /usr/local/bin/gcc
- gcc --version - gcc --version
script: script:
# Use travis-wait to allow slower tests to run # Use travis-wait to allow slower tests to run
- "cd test && travis_wait 60 python3 -m pytest --numprocesses=auto" - "cd test && travis_wait 60 python3 -m pytest --numprocesses=auto"
- name: "SIGs on MacOS + Clang" - name: "SIGs on MacOS + Clang"
os: osx os: osx
osx_image: xcode10.2 osx_image: xcode11.2
compiler: clang compiler: clang
before_install: before_install:
- pip3 install -r requirements.txt - pip3 install -r requirements.txt
@ -75,15 +75,15 @@ matrix:
homebrew: homebrew:
packages: packages:
- astyle - astyle
- name: "SIGs on MacOS + GCC8" - name: "SIGs on MacOS + GCC9"
os: osx os: osx
osx_image: xcode10.2 osx_image: xcode11.2
compiler: gcc compiler: gcc
addons: addons:
homebrew: homebrew:
packages: packages:
- astyle - astyle
- gcc@8 - gcc@9
env: env:
PQCLEAN_ONLY_TYPES: sign PQCLEAN_ONLY_TYPES: sign
PQCLEAN_ONLY_DIFF: 1 PQCLEAN_ONLY_DIFF: 1
@ -97,7 +97,7 @@ matrix:
- pip3 install -r requirements.txt - pip3 install -r requirements.txt
- brew link gcc - brew link gcc
- export PATH="/usr/local/bin:$PATH" - export PATH="/usr/local/bin:$PATH"
- ln -s /usr/local/bin/gcc-8 /usr/local/bin/gcc - ln -s /usr/local/bin/gcc-9 /usr/local/bin/gcc
- gcc --version - gcc --version
script: script:
# Use travis-wait to allow slower tests to run # Use travis-wait to allow slower tests to run