Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
9cee677c
Unverified
Commit
9cee677c
authored
Jan 04, 2018
by
Carlos O'Ryan
Committed by
GitHub
Jan 04, 2018
Browse files
Optimize build matrix (#1)
Disable expensive builds on pull requests.
parent
a5014476
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
1 deletion
+23
-1
.travis.yml
.travis.yml
+4
-0
appveyor.yml
appveyor.yml
+19
-1
No files found.
.travis.yml
View file @
9cee677c
...
@@ -38,15 +38,19 @@ matrix:
...
@@ -38,15 +38,19 @@ matrix:
-
os
:
osx
-
os
:
osx
compiler
:
gcc
compiler
:
gcc
env
:
BUILD_TYPE=Debug VERBOSE=1
env
:
BUILD_TYPE=Debug VERBOSE=1
if
:
event != pull_request
-
os
:
osx
-
os
:
osx
compiler
:
gcc
compiler
:
gcc
env
:
BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11
env
:
BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11
if
:
event != pull_request
-
os
:
osx
-
os
:
osx
compiler
:
clang
compiler
:
clang
env
:
BUILD_TYPE=Debug VERBOSE=1
env
:
BUILD_TYPE=Debug VERBOSE=1
if
:
event != pull_request
-
os
:
osx
-
os
:
osx
compiler
:
clang
compiler
:
clang
env
:
BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11
env
:
BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11
if
:
event != pull_request
# These are the install and build (script) phases for the most common entries in the matrix. They could be included
# These are the install and build (script) phases for the most common entries in the matrix. They could be included
# in each entry in the matrix, but that is just repetitive.
# in each entry in the matrix, but that is just repetitive.
...
...
appveyor.yml
View file @
9cee677c
...
@@ -11,6 +11,7 @@ environment:
...
@@ -11,6 +11,7 @@ environment:
-
compiler
:
msvc-15-seh
-
compiler
:
msvc-15-seh
generator
:
"
Visual
Studio
15
2017
Win64"
generator
:
"
Visual
Studio
15
2017
Win64"
APPVEYOR_BUILD_WORKER_IMAGE
:
Visual Studio
2017
APPVEYOR_BUILD_WORKER_IMAGE
:
Visual Studio
2017
enabled_on_pr
:
yes
-
compiler
:
msvc-14-seh
-
compiler
:
msvc-14-seh
generator
:
"
Visual
Studio
14
2015"
generator
:
"
Visual
Studio
14
2015"
...
@@ -43,7 +44,6 @@ environment:
...
@@ -43,7 +44,6 @@ environment:
configuration
:
configuration
:
-
Debug
-
Debug
#- Release
build
:
build
:
verbosity
:
minimal
verbosity
:
minimal
...
@@ -52,6 +52,16 @@ install:
...
@@ -52,6 +52,16 @@ install:
-
ps
:
|
-
ps
:
|
Write-Output "Compiler: $env:compiler"
Write-Output "Compiler: $env:compiler"
Write-Output "Generator: $env:generator"
Write-Output "Generator: $env:generator"
Write-Output "Pull Request: <$env:APPVEYOR_PULL_REQUEST_NUMBER>"
Write-Output "Enabled on PR: <$env:enabled_on_pr>"
if (-not (Test-Path env:APPVEYOR_PULL_REQUEST_NUMBER)) {
Write-Output "This is a pull request build"
if (-not (Test-Path env:enabled_on_pr) -or $env:enabled_on_pr -ne "yes") {
Write-Output "PR builds are *NOT* explicitly enabled"
}
} else {
Write-Output "This is *NOT* a pull request build"
}
# git bash conflicts with MinGW makefiles
# git bash conflicts with MinGW makefiles
if ($env:generator -eq "MinGW Makefiles") {
if ($env:generator -eq "MinGW Makefiles") {
...
@@ -63,6 +73,10 @@ install:
...
@@ -63,6 +73,10 @@ install:
build_script
:
build_script
:
-
ps
:
|
-
ps
:
|
# Only enable some builds for pull requests, the AppVeyor queue is too long.
if (-not (Test-Path env:APPVEYOR_PULL_REQUEST_NUMBER) -And (-not (Test-Path env:enabled_on_pr) -or $env:enabled_on_pr -ne "")) {
return
}
md _build -Force | Out-Null
md _build -Force | Out-Null
cd _build
cd _build
...
@@ -81,6 +95,10 @@ build_script:
...
@@ -81,6 +95,10 @@ build_script:
test_script
:
test_script
:
-
ps
:
|
-
ps
:
|
# Only enable some builds for pull requests, the AppVeyor queue is too long.
if (-not (Test-Path env:APPVEYOR_PULL_REQUEST_NUMBER) -And (-not (Test-Path env:enabled_on_pr) -or $env:enabled_on_pr -ne "")) {
return
}
if ($env:generator -eq "MinGW Makefiles") {
if ($env:generator -eq "MinGW Makefiles") {
return # No test available for MinGW
return # No test available for MinGW
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment