Dynamically install NGinx Internal/#1525 (#6963)
This commit is contained in:
parent
07926f0677
commit
2b7c26a123
|
|
@ -24,12 +24,18 @@ jobs:
|
|||
jobDisplayName: "Build and test: macOS"
|
||||
agentOs: macOs
|
||||
buildScript: ./eng/scripts/cibuild.sh
|
||||
beforeBuild:
|
||||
- bash: "./eng/scripts/install-nginx-mac.sh"
|
||||
displayName: Installing Nginx
|
||||
- template: jobs/default-build.yml
|
||||
parameters:
|
||||
jobName: Linux_Build
|
||||
jobDisplayName: "Build and test: Linux"
|
||||
agentOs: Linux
|
||||
buildScript: ./eng/scripts/cibuild.sh
|
||||
beforeBuild:
|
||||
- bash: "./eng/scripts/install-nginx-linux.sh"
|
||||
displayName: Installing Nginx
|
||||
- template: jobs/iisintegration-job.yml
|
||||
parameters:
|
||||
TestGroupName: IIS
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@
|
|||
|
||||
set -euo pipefail
|
||||
|
||||
export PATH="$PATH:$HOME/nginxinstall/sbin/"
|
||||
|
||||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
repo_root="$DIR/../.."
|
||||
"$repo_root/build.sh" --ci --all --restore --build --pack --test "$@"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
brew update
|
||||
brew install openssl nginx
|
||||
|
|
@ -20,7 +20,7 @@ namespace ServerComparison.FunctionalTests
|
|||
}
|
||||
|
||||
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)
|
||||
.WithApplicationTypes(ApplicationType.Portable)
|
||||
.WithAncmVersions(AncmVersion.AspNetCoreModuleV2)
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ namespace ServerComparison.FunctionalTests
|
|||
}
|
||||
|
||||
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)
|
||||
.WithAncmVersions(AncmVersion.AspNetCoreModuleV2)
|
||||
.WithAllHostingModels();
|
||||
|
|
@ -45,7 +45,7 @@ namespace ServerComparison.FunctionalTests
|
|||
}
|
||||
|
||||
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)
|
||||
.WithAncmVersions(AncmVersion.AspNetCoreModuleV2)
|
||||
.WithAllHostingModels();
|
||||
|
|
@ -71,7 +71,7 @@ namespace ServerComparison.FunctionalTests
|
|||
}
|
||||
|
||||
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)
|
||||
.WithAncmVersions(AncmVersion.AspNetCoreModuleV2)
|
||||
.WithAllHostingModels();
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ namespace ServerComparison.FunctionalTests
|
|||
}
|
||||
|
||||
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)
|
||||
.WithAncmVersions(AncmVersion.AspNetCoreModuleV2)
|
||||
.WithAllHostingModels();
|
||||
|
|
|
|||
Loading…
Reference in New Issue