Skip to content
Permalink
Browse files
Merge pull request #71 from alliedmodders/amb22
Upgrade to AMBuild 2.2.
  • Loading branch information
dvander committed Aug 19, 2020
2 parents 3c5f0ca + acea12f commit e375e3a76ff2aad5fc79d1e913b1126bf9812165
Show file tree
Hide file tree
Showing 10 changed files with 153 additions and 175 deletions.
@@ -36,12 +36,6 @@ addons:
cache:
directories:
- ../mysql-5.0
env:
- MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9"
- MATRIX_EVAL="CC=gcc-4.8 && CXX=g++-4.8"
- MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
- MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"

matrix:
fast_finish: true
@@ -62,24 +56,6 @@ matrix:
packages: ['clang-3.8', 'lib32stdc++6', 'lib32z1-dev', 'libc6-dev-i386', 'linux-libc-dev', 'g++-multilib']
env: ['MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8"']

- os: linux
sudo: false
language: cpp
addons:
apt:
sources: ['llvm-toolchain-trusty-4.0']
packages: ['clang-4.0', 'lib32stdc++6', 'lib32z1-dev', 'libc6-dev-i386', 'linux-libc-dev', 'g++-multilib']
env: ['MATRIX_EVAL="CC=clang-4.0 && CXX=clang++-4.0"']

- os: linux
sudo: false
language: cpp
addons:
apt:
sources: ['llvm-toolchain-trusty-5.0']
packages: ['clang-5.0', 'lib32stdc++6', 'lib32z1-dev', 'libc6-dev-i386', 'linux-libc-dev', 'g++-multilib']
env: ['MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0"']

- os: linux
sudo: false
language: cpp
@@ -89,15 +65,6 @@ matrix:
packages: ['g++-6', 'g++-6-multilib', 'lib32stdc++6', 'lib32z1-dev', 'libc6-dev-i386', 'linux-libc-dev', 'g++-multilib']
env: ['MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"']

allow_failures:
- env: MATRIX_EVAL="CC=clang-3.7 && CXX=clang++-3.7"
- env: MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9"
- env: MATRIX_EVAL="CC=gcc-4.8 && CXX=g++-4.8"
- env: MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
- env: MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
- env: MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"


before_script:
- CHECKOUT_DIR=$PWD && cd .. && $CHECKOUT_DIR/support/checkout-deps.sh && cd $CHECKOUT_DIR
script:
@@ -109,8 +76,10 @@ script:
- cd .. && mkdir build-sh-opt && cd build-sh-opt
- python ../configure.py --enable-optimize --enable-tests --sdks=
- ambuild
- ./core/sourcehook/test/test_sourcehook/test_sourcehook -v
- ./core/sourcehook/test/test_sourcehook/linux-x86/test_sourcehook -v
- ./core/sourcehook/test/test_sourcehook/linux-x86_64/test_sourcehook -v
- cd .. && mkdir build-sh-debug && cd build-sh-debug
- python ../configure.py --enable-debug --enable-tests --sdks=
- ambuild
- ./core/sourcehook/test/test_sourcehook/test_sourcehook -v
- ./core/sourcehook/test/test_sourcehook/linux-x86/test_sourcehook -v
- ./core/sourcehook/test/test_sourcehook/linux-x86_64/test_sourcehook -v

0 comments on commit e375e3a

Please sign in to comment.