Skip to content

Commit be7fed8

Browse files
authored
Fix nginx (#63966)
1 parent 8b05dba commit be7fed8

File tree

4 files changed

+5
-10
lines changed

4 files changed

+5
-10
lines changed

.azure/pipelines/ci-public.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ stages:
578578
isAzDOTestingJob: true
579579
buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
580580
beforeBuild:
581-
- bash: "./eng/scripts/install-nginx-mac.sh"
581+
- bash: "./eng/scripts/install-nginx.sh"
582582
displayName: Installing Nginx
583583
artifacts:
584584
- name: MacOS_Test_Logs_Attempt_$(System.JobAttempt)
@@ -599,7 +599,7 @@ stages:
599599
useHostedUbuntu: false
600600
buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
601601
beforeBuild:
602-
- bash: "./eng/scripts/install-nginx-linux.sh"
602+
- bash: "./eng/scripts/install-nginx.sh"
603603
displayName: Installing Nginx
604604
- bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
605605
displayName: Increase inotify limit

.azure/pipelines/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ extends:
639639
isAzDOTestingJob: true
640640
buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
641641
beforeBuild:
642-
- bash: "./eng/scripts/install-nginx-mac.sh"
642+
- bash: "./eng/scripts/install-nginx.sh"
643643
displayName: Installing Nginx
644644
artifacts:
645645
- name: MacOS_Test_Logs_Attempt_$(System.JobAttempt)
@@ -660,7 +660,7 @@ extends:
660660
useHostedUbuntu: false
661661
buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
662662
beforeBuild:
663-
- bash: "./eng/scripts/install-nginx-linux.sh"
663+
- bash: "./eng/scripts/install-nginx.sh"
664664
displayName: Installing Nginx
665665
- bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
666666
displayName: Increase inotify limit

eng/scripts/install-nginx-mac.sh

Lines changed: 0 additions & 5 deletions
This file was deleted.

eng/scripts/install-nginx-linux.sh renamed to eng/scripts/install-nginx.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ scriptroot="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
66
reporoot="$(dirname "$(dirname "$scriptroot")")"
77
nginxinstall="$reporoot/.tools/nginx"
88

9-
curl -sSL http://nginx.org/download/nginx-1.26.3.tar.gz --retry 5 | tar zxfv - -C /tmp && cd /tmp/nginx-1.26.3/
9+
curl -sSL http://nginx.org/download/nginx-1.29.1.tar.gz --retry 5 | tar zxfv - -C /tmp && cd /tmp/nginx-1.29.1/
1010
./configure --prefix=$nginxinstall --with-http_ssl_module --without-http_rewrite_module
1111
make
1212
make install

0 commit comments

Comments
 (0)