Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
d3acb4ba
Unverified
Commit
d3acb4ba
authored
Jan 05, 2018
by
Carlos O'Ryan
Browse files
Fixed output and test for 'enabled_on_pr'
parent
9cee677c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
6 deletions
+4
-6
appveyor.yml
appveyor.yml
+4
-6
No files found.
appveyor.yml
View file @
d3acb4ba
...
@@ -52,15 +52,13 @@ install:
...
@@ -52,15 +52,13 @@ 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)) {
if (-not (Test-Path env:APPVEYOR_PULL_REQUEST_NUMBER)) {
Write-Output "This is *NOT* a pull request build"
} else {
Write-Output "This is a pull request build"
Write-Output "This is a pull request build"
if (-not (Test-Path env:enabled_on_pr) -or $env:enabled_on_pr -ne "yes") {
if (-not (Test-Path env:enabled_on_pr) -or $env:enabled_on_pr -ne "yes") {
Write-Output "PR builds are *NOT* explicitly enabled"
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
...
@@ -74,7 +72,7 @@ install:
...
@@ -74,7 +72,7 @@ install:
build_script
:
build_script
:
-
ps
:
|
-
ps
:
|
# Only enable some builds for pull requests, the AppVeyor queue is too long.
# 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 "")) {
if (-not (Test-Path env:APPVEYOR_PULL_REQUEST_NUMBER) -And (-not (Test-Path env:enabled_on_pr) -or $env:enabled_on_pr -ne "
yes
")) {
return
return
}
}
md _build -Force | Out-Null
md _build -Force | Out-Null
...
@@ -96,7 +94,7 @@ build_script:
...
@@ -96,7 +94,7 @@ build_script:
test_script
:
test_script
:
-
ps
:
|
-
ps
:
|
# Only enable some builds for pull requests, the AppVeyor queue is too long.
# 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 "")) {
if (-not (Test-Path env:APPVEYOR_PULL_REQUEST_NUMBER) -And (-not (Test-Path env:enabled_on_pr) -or $env:enabled_on_pr -ne "
yes
")) {
return
return
}
}
if ($env:generator -eq "MinGW Makefiles") {
if ($env:generator -eq "MinGW Makefiles") {
...
...
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