update config script

microsoft · Sep 1, 2023 · 509621d · 509621d
1 parent 642b41c
commit 509621d
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 37 deletions.
diff --git a/.azure-pipelines/pipeline.yml b/.azure-pipelines/pipeline.yml
@@ -74,6 +74,7 @@ stages:
       variables:
         DisableDockerDetector: true
         nugetMultiFeedWarnLevel: none
+      timeoutInMinutes: 300
       steps:
       - bash: |
           cd ./.azure-pipelines/scripts/
@@ -205,7 +206,7 @@ stages:
         publishArtifacts: ${{ parameters.publishArtifacts }}
         buildAlternatePackage: false
 
-  # macOS x64
+  # macOS (x64)
   - ${{ if parameters.macOS_x64 }}:
     - template: build-jobs.yml
       parameters:
@@ -223,12 +224,12 @@ stages:
         publishArtifacts: ${{ parameters.publishArtifacts }}
         buildAlternatePackage: ${{ parameters.buildAlternatePackage }}
 
-  # macOS arm64
+  # macOS (ARM64)
   - ${{ if parameters.macOS_arm64 }}:
     - template: build-jobs.yml
       parameters:
         jobName: build_osx_arm64
-        displayName: macOS (arm64)
+        displayName: macOS (ARM64)
         pool:
           vmImage: macOS-12
         os: osx

diff --git a/releaseNote.md b/releaseNote.md
@@ -6,7 +6,7 @@
 | Windows x64    | [vsts-agent-win-x64-<AGENT_VERSION>.zip](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/vsts-agent-win-x64-<AGENT_VERSION>.zip) | <HASH> |
 | Windows x86    | [vsts-agent-win-x86-<AGENT_VERSION>.zip](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/vsts-agent-win-x86-<AGENT_VERSION>.zip) | <HASH> |
 | macOS x64      | [vsts-agent-osx-x64-<AGENT_VERSION>.tar.gz](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/vsts-agent-osx-x64-<AGENT_VERSION>.tar.gz) | <HASH> |
-| macOS arm64    | [vsts-agent-osx-arm64-<AGENT_VERSION>.tar.gz](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/vsts-agent-osx-arm64-<AGENT_VERSION>.tar.gz) | <HASH> |
+| macOS ARM64    | [vsts-agent-osx-arm64-<AGENT_VERSION>.tar.gz](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/vsts-agent-osx-arm64-<AGENT_VERSION>.tar.gz) | <HASH> |
 | Linux x64      | [vsts-agent-linux-x64-<AGENT_VERSION>.tar.gz](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/vsts-agent-linux-x64-<AGENT_VERSION>.tar.gz) | <HASH> |
 | Linux ARM      | [vsts-agent-linux-arm-<AGENT_VERSION>.tar.gz](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/vsts-agent-linux-arm-<AGENT_VERSION>.tar.gz) | <HASH> |
 | Linux ARM64    | [vsts-agent-linux-arm64-<AGENT_VERSION>.tar.gz](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/vsts-agent-linux-arm64-<AGENT_VERSION>.tar.gz) | <HASH> |
@@ -35,7 +35,7 @@ C:\myagent> Add-Type -AssemblyName System.IO.Compression.FileSystem ; [System.IO
 ~/myagent$ tar xzf ~/Downloads/vsts-agent-osx-x64-<AGENT_VERSION>.tar.gz
 ```
 
-## macOS arm64
+## macOS ARM64
 
 ``` bash
 ~/$ mkdir myagent && cd myagent
@@ -82,7 +82,7 @@ See [notes](docs/node6.md) on Node version support for more details.
 | Windows x64 | [pipelines-agent-win-x64-<AGENT_VERSION>.zip](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/pipelines-agent-win-x64-<AGENT_VERSION>.zip) | <HASH> |
 | Windows x86 | [pipelines-agent-win-x86-<AGENT_VERSION>.zip](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/pipelines-agent-win-x86-<AGENT_VERSION>.zip) | <HASH> |
 | macOS x64   | [pipelines-agent-osx-x64-<AGENT_VERSION>.tar.gz](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/pipelines-agent-osx-x64-<AGENT_VERSION>.tar.gz) | <HASH> |
-| macOS arm64 | [pipelines-agent-osx-arm64-<AGENT_VERSION>.tar.gz](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/pipelines-agent-osx-x64-<AGENT_VERSION>.tar.gz) | <HASH> |
+| macOS ARM64 | [pipelines-agent-osx-arm64-<AGENT_VERSION>.tar.gz](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/pipelines-agent-osx-x64-<AGENT_VERSION>.tar.gz) | <HASH> |
 | Linux x64   | [pipelines-agent-linux-x64-<AGENT_VERSION>.tar.gz](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/pipelines-agent-linux-x64-<AGENT_VERSION>.tar.gz) | <HASH> |
 | Linux ARM   | [pipelines-agent-linux-arm-<AGENT_VERSION>.tar.gz](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/pipelines-agent-linux-arm-<AGENT_VERSION>.tar.gz) | <HASH> |
 | Linux ARM64 | [pipelines-agent-linux-arm64-<AGENT_VERSION>.tar.gz](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/pipelines-agent-linux-arm64-<AGENT_VERSION>.tar.gz) | <HASH> |
diff --git a/src/Misc/layoutroot/config.sh b/src/Misc/layoutroot/config.sh
@@ -1,74 +1,74 @@
 #!/bin/bash
 
-user_id=`id -u`
+user_id="$(id -u)"
 
 # we want to snapshot the environment of the config user
 if [ $user_id -eq 0 -a -z "$AGENT_ALLOW_RUNASROOT" ]; then
     echo "Must not run with sudo"
     exit 1
 fi
 
-function detect_rhel6()
-{
-    if [ -e /etc/redhat-release ]
-    then
-        redhatRelease=$(</etc/redhat-release)
-        if [[ $redhatRelease == "CentOS release 6."* || $redhatRelease == "Red Hat Enterprise Linux Server release 6."* ]]
-        then
-            echo "NOT SUPPORTED BY .NET 6. The current OS is Red Hat Enterprise Linux 6 or Centos 6"
+# Check dotnet core 6.0 dependencies for Linux
+if [[ "$(uname)" == "Linux" ]]; then
+    if [ -e /etc/redhat-release ]; then
+        redhatRelease=$(grep -oE "[0-9]+" /etc/redhat-release | awk "NR==1")
+        if [[ "${redhatRelease}" -lt 7 ]]; then
+            echo "RHEL supported for version 7 and higher."
             exit 1
         fi
     fi
-}
 
-# Check dotnet core 6.0 dependencies for Linux
-if [[ (`uname` == "Linux") ]]
-then
-    detect_rhel6
     command -v ldd > /dev/null
-    if [ $? -ne 0 ]
-    then
+    if [ $? -ne 0 ]; then
         echo "Can not find 'ldd'. Please install 'ldd' and try again."
         exit 1
     fi
 
-    ldd ./bin/libcoreclr.so | grep -E 'not found|No such'
+    ldd ./bin/libcoreclr.so | grep -E "not found|No such"
     if [ $? -eq 0 ]; then
         echo "Dependencies is missing for .NET Core 6.0"
         echo "Execute ./bin/installdependencies.sh to install any missing dependencies."
         exit 1
     fi
 
-    ldd ./bin/libSystem.Security.Cryptography.Native.OpenSsl.so | grep -E 'not found|No such'
+    ldd ./bin/libSystem.Security.Cryptography.Native.OpenSsl.so | grep -E "not found|No such"
     if [ $? -eq 0 ]; then
         echo "Dependencies missing for .NET 6.0"
         echo "Execute ./bin/installdependencies.sh to install any missing dependencies."
         exit 1
     fi
 
-    ldd ./bin/libSystem.IO.Compression.Native.so | grep -E 'not found|No such'
+    ldd ./bin/libSystem.IO.Compression.Native.so | grep -E "not found|No such"
     if [ $? -eq 0 ]; then
         echo "Dependencies missing for .NET 6.0"
         echo "Execute ./bin/installdependencies.sh to install any missing dependencies."
         exit 1
     fi
 
-    if ! [ -x "$(command -v ldconfig)" ]; then
-        LDCONFIG_COMMAND="/sbin/ldconfig"
-        if ! [ -x "$LDCONFIG_COMMAND" ]; then
-            echo "Can not find 'ldconfig' in PATH and '/sbin/ldconfig' doesn't exists either. Please install 'ldconfig' and try again."
+    if [ -e /etc/alpine-release ]; then
+        if [ -z "$(apk info 2>&1 | grep icu-libs)" ]; then
+            echo "icu-libs are missing"
+            echo "Execute ./bin/installdependencies.sh to install any missing dependencies."
             exit 1
         fi
     else
-        LDCONFIG_COMMAND="ldconfig"
-    fi
+        LDCONFIG="ldconfig"
+        if ! [ -x "$(command -v $LDCONFIG)" ]; then
+            LDCONFIG="/sbin/ldconfig"
 
-    libpath=${LD_LIBRARY_PATH:-}
-    $LDCONFIG_COMMAND -NXv ${libpath//:/} 2>&1 | grep libicu >/dev/null 2>&1
-    if [ $? -ne 0 ]; then
-        echo "libicu's dependencies missing for .NET 6"
-        echo "Execute ./bin/installdependencies.sh to install any missing dependencies."
-        exit 1
+            if ! [ -x "$LDCONFIG" ]; then
+                echo "Can not find 'ldconfig' in PATH and '/sbin/ldconfig' doesn't exists either. Please install 'ldconfig' and try again."
+                exit 1
+            fi
+        fi
+
+        libpath="${LD_LIBRARY_PATH:-}"
+        $LDCONFIG -NXv "${libpath//:/}" 2>&1 | grep libicu >/dev/null 2>&1
+        if [ $? -ne 0 ]; then
+            echo "libicu's dependencies missing for .NET 6"
+            echo "Execute ./bin/installdependencies.sh to install any missing dependencies."
+            exit 1
+        fi
     fi
 fi