huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Dynamically install NGinx Internal/#1525 (#6963)

This commit is contained in:
Chris Ross 2019-01-25 14:32:32 -08:00 committed by GitHub
parent 07926f0677
commit 2b7c26a123
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.azure/pipelines/ci.yml
View File

@ -24,12 +24,18 @@ jobs:
jobDisplayName: "Build and test: macOS" jobDisplayName: "Build and test: macOS"
agentOs: macOs agentOs: macOs
buildScript: ./eng/scripts/cibuild.sh buildScript: ./eng/scripts/cibuild.sh
beforeBuild:
- bash: "./eng/scripts/install-nginx-mac.sh"
displayName: Installing Nginx
- template: jobs/default-build.yml - template: jobs/default-build.yml
parameters: parameters:
jobName: Linux_Build jobName: Linux_Build
jobDisplayName: "Build and test: Linux" jobDisplayName: "Build and test: Linux"
agentOs: Linux agentOs: Linux
buildScript: ./eng/scripts/cibuild.sh buildScript: ./eng/scripts/cibuild.sh
beforeBuild:
- bash: "./eng/scripts/install-nginx-linux.sh"
displayName: Installing Nginx
- template: jobs/iisintegration-job.yml - template: jobs/iisintegration-job.yml
parameters: parameters:
TestGroupName: IIS TestGroupName: IIS

2
eng/scripts/cibuild.sh
View File

@ -2,6 +2,8 @@
set -euo pipefail set -euo pipefail
export PATH="$PATH:$HOME/nginxinstall/sbin/"
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
repo_root="$DIR/../.." repo_root="$DIR/../.."
"$repo_root/build.sh" --ci --all --restore --build --pack --test "$@" "$repo_root/build.sh" --ci --all --restore --build --pack --test "$@"

6
eng/scripts/install-nginx-linux.sh Executable file
View File

@ -0,0 +1,6 @@
#!/usr/bin/env bash
curl -sSL http://nginx.org/download/nginx-1.14.2.tar.gz | tar zxfv - -C /tmp && cd /tmp/nginx-1.14.2/
./configure --prefix=$HOME/nginxinstall --with-http_ssl_module
make
make install

4
eng/scripts/install-nginx-mac.sh Executable file
View File

@ -0,0 +1,4 @@
#!/usr/bin/env bash
brew update
brew install openssl nginx

2
src/Servers/test/FunctionalTests/HelloWorldTest.cs
View File

@ -20,7 +20,7 @@ namespace ServerComparison.FunctionalTests
} }
public static TestMatrix TestVariants public static TestMatrix TestVariants
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, /* ServerType.Nginx, https://github.com/aspnet/AspNetCore-Internal/issues/1525 */ ServerType.HttpSys) => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.Nginx, ServerType.HttpSys)
.WithTfms(Tfm.NetCoreApp30) .WithTfms(Tfm.NetCoreApp30)
.WithApplicationTypes(ApplicationType.Portable) .WithApplicationTypes(ApplicationType.Portable)
.WithAncmVersions(AncmVersion.AspNetCoreModuleV2) .WithAncmVersions(AncmVersion.AspNetCoreModuleV2)

6
src/Servers/test/FunctionalTests/ResponseCompressionTests.cs
View File

@ -32,7 +32,7 @@ namespace ServerComparison.FunctionalTests
} }
public static TestMatrix NoCompressionTestVariants public static TestMatrix NoCompressionTestVariants
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, /* ServerType.Nginx, https://github.com/aspnet/AspNetCore-Internal/issues/1525 */ ServerType.HttpSys) => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.Nginx, ServerType.HttpSys)
.WithTfms(Tfm.NetCoreApp30) .WithTfms(Tfm.NetCoreApp30)
.WithAncmVersions(AncmVersion.AspNetCoreModuleV2) .WithAncmVersions(AncmVersion.AspNetCoreModuleV2)
.WithAllHostingModels(); .WithAllHostingModels();
@ -45,7 +45,7 @@ namespace ServerComparison.FunctionalTests
} }
public static TestMatrix HostCompressionTestVariants public static TestMatrix HostCompressionTestVariants
=> TestMatrix.ForServers(ServerType.IISExpress /*, ServerType.Nginx https://github.com/aspnet/AspNetCore-Internal/issues/1525 */ ) => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Nginx)
.WithTfms(Tfm.NetCoreApp30) .WithTfms(Tfm.NetCoreApp30)
.WithAncmVersions(AncmVersion.AspNetCoreModuleV2) .WithAncmVersions(AncmVersion.AspNetCoreModuleV2)
.WithAllHostingModels(); .WithAllHostingModels();
@ -71,7 +71,7 @@ namespace ServerComparison.FunctionalTests
} }
public static TestMatrix HostAndAppCompressionTestVariants public static TestMatrix HostAndAppCompressionTestVariants
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, /* ServerType.Nginx, https://github.com/aspnet/AspNetCore-Internal/issues/1525 */ ServerType.HttpSys) => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.Nginx, ServerType.HttpSys)
.WithTfms(Tfm.NetCoreApp30) .WithTfms(Tfm.NetCoreApp30)
.WithAncmVersions(AncmVersion.AspNetCoreModuleV2) .WithAncmVersions(AncmVersion.AspNetCoreModuleV2)
.WithAllHostingModels(); .WithAllHostingModels();

2
src/Servers/test/FunctionalTests/ResponseTests.cs
View File

@ -25,7 +25,7 @@ namespace ServerComparison.FunctionalTests
} }
public static TestMatrix TestVariants public static TestMatrix TestVariants
=> TestMatrix.ForServers(/* ServerType.IISExpress, https://github.com/aspnet/AspNetCore/issues/6168, */ ServerType.Kestrel, /* ServerType.Nginx, https://github.com/aspnet/AspNetCore-Internal/issues/1525 */ ServerType.HttpSys) => TestMatrix.ForServers(/* ServerType.IISExpress, https://github.com/aspnet/AspNetCore/issues/6168, */ ServerType.Kestrel, ServerType.Nginx, ServerType.HttpSys)
.WithTfms(Tfm.NetCoreApp30) .WithTfms(Tfm.NetCoreApp30)
.WithAncmVersions(AncmVersion.AspNetCoreModuleV2) .WithAncmVersions(AncmVersion.AspNetCoreModuleV2)
.WithAllHostingModels(); .WithAllHostingModels();