Merge branch 'master' into 150-runner-arch

Conflicts:
releaseNote.md
src/runnerversion

.github/workflows/build.yml

@@ -13,14 +13,33 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest]
+        runtime: [ linux-x64, linux-arm64, linux-arm, win-x64, osx-x64 ]
+        # runtime: [ linux-x64, linux-arm64, linux-arm, win-x64, win-x86, osx-x64 ]
         include:
-        - os: ubuntu-latest
+        - runtime: linux-x64
+          os: ubuntu-latest
           devScript: ./dev.sh
-        - os: macOS-latest
+
+        - runtime: linux-arm64
+          os: ubuntu-latest
           devScript: ./dev.sh
-        - os: windows-latest
+
+        - runtime: linux-arm
+          os: ubuntu-latest
+          devScript: ./dev.sh
+
+        - runtime: osx-x64
+          os: macOS-latest
+          devScript: ./dev.sh
+
+        - runtime: win-x64
+          os: windows-latest
           devScript: ./dev
+
+        # - runtime: win-x86
+        #   os: windows-latest
+        #   devScript: ./dev
+
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v1
@@ -28,7 +47,7 @@ jobs:
     # Build runner layout
     - name: Build & Layout Release
       run: |
-        ${{ matrix.devScript }} layout Release
+        ${{ matrix.devScript }} layout Release ${{ matrix.runtime }}
       working-directory: src
 
     # Run tests
@@ -36,6 +55,7 @@ jobs:
       run: |
         ${{ matrix.devScript }} test
       working-directory: src
+      if: matrix.runtime != 'linux-arm64' && matrix.runtime != 'linux-arm'
 
     # Create runner package tar.gz/zip
     - name: Package Release
@@ -49,5 +69,5 @@ jobs:
       if: github.event_name != 'pull_request'
       uses: actions/upload-artifact@v1
       with:
-        name: runner-package-${{ matrix.os }} 
+        name: runner-package-${{ matrix.runtime }}
         path: _package

assets.json

@@ -16,5 +16,17 @@
         "platform": "linux-x64",
         "version": "<RUNNER_VERSION>",
         "downloadUrl": "https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-linux-x64-<RUNNER_VERSION>.tar.gz"
+    },
+    {
+        "name": "actions-runner-linux-arm64-<RUNNER_VERSION>.tar.gz",
+        "platform": "linux-arm64",
+        "version": "<RUNNER_VERSION>",
+        "downloadUrl": "https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-linux-arm64-<RUNNER_VERSION>.tar.gz"
+    },
+    {
+        "name": "actions-runner-linux-arm-<RUNNER_VERSION>.tar.gz",
+        "platform": "linux-arm",
+        "version": "<RUNNER_VERSION>",
+        "downloadUrl": "https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-linux-arm-<RUNNER_VERSION>.tar.gz"
     }
 ]

azure-pipelines-release.yml

@@ -11,6 +11,8 @@ stages:
 
     # Steps template for windows platform
     - template: windows.template.yml
+      parameters:
+        targetRuntime: win-x64
 
     # Package dotnet core windows dependency (VC++ Redistributable)
     - powershell: |
@@ -28,7 +30,7 @@ stages:
       displayName: Package UCRT
 
     # Create agent package zip
-    - script: dev.cmd package Release
+    - script: dev.cmd package Release win-x64
       workingDirectory: src
       displayName: Package Release
 
@@ -40,6 +42,47 @@ stages:
         artifactName: runners
         artifactType: container
 
+  # ################################################################################
+  # - job: build_windows_agent_x86
+  # ################################################################################
+  #   displayName: Windows Agent (x86)
+  #   pool:
+  #     vmImage: vs2017-win2016
+  #   steps:
+
+  #   # Steps template for windows platform
+  #   - template: windows.template.yml
+  #     parameters:
+  #       targetRuntime: win-x86
+
+  #   # Package dotnet core windows dependency (VC++ Redistributable)
+  #   - powershell: |
+  #       Write-Host "Downloading 'VC++ Redistributable' package."
+  #       $outDir = Join-Path -Path $env:TMP -ChildPath ([Guid]::NewGuid())
+  #       New-Item -Path $outDir -ItemType directory
+  #       $outFile = Join-Path -Path $outDir -ChildPath "ucrt.zip"
+  #       Invoke-WebRequest -Uri https://vstsagenttools.blob.core.windows.net/tools/ucrt/ucrt_x86.zip -OutFile $outFile
+  #       Write-Host "Unzipping 'VC++ Redistributable' package to agent layout."
+  #       $unzipDir = Join-Path -Path $outDir -ChildPath "unzip"
+  #       Add-Type -AssemblyName System.IO.Compression.FileSystem
+  #       [System.IO.Compression.ZipFile]::ExtractToDirectory($outFile, $unzipDir)
+  #       $agentLayoutBin = Join-Path -Path $(Build.SourcesDirectory) -ChildPath "_layout\bin"
+  #       Copy-Item -Path $unzipDir -Destination $agentLayoutBin -Force
+  #     displayName: Package UCRT
+
+  #   # Create agent package zip
+  #   - script: dev.cmd package Release win-x86
+  #     workingDirectory: src
+  #     displayName: Package Release
+
+  #   # Upload agent package zip as build artifact
+  #   - task: PublishBuildArtifacts@1
+  #     displayName: Publish Artifact (Windows)
+  #     inputs:
+  #       pathToPublish: _package
+  #       artifactName: runners
+  #       artifactType: container
+
   ################################################################################
   - job: build_linux_agent_x64
   ################################################################################
@@ -50,9 +93,11 @@ stages:
 
     # Steps template for non-windows platform
     - template: nonwindows.template.yml
+      parameters:
+        targetRuntime: linux-x64
 
     # Create agent package zip
-    - script: ./dev.sh package Release
+    - script: ./dev.sh package Release linux-x64
       workingDirectory: src
       displayName: Package Release
 
@@ -65,7 +110,59 @@ stages:
         artifactType: container
 
   ################################################################################
-  - job: build_osx_agent
+  - job: build_linux_agent_arm64
+  ################################################################################
+    displayName: Linux Agent (arm64)
+    pool:
+      vmImage: ubuntu-16.04
+    steps:
+
+    # Steps template for non-windows platform
+    - template: nonwindows.template.yml
+      parameters:
+        targetRuntime: linux-arm64
+
+    # Create agent package zip
+    - script: ./dev.sh package Release linux-arm64
+      workingDirectory: src
+      displayName: Package Release
+
+    # Upload agent package zip as build artifact
+    - task: PublishBuildArtifacts@1
+      displayName: Publish Artifact (Linux)
+      inputs:
+        pathToPublish: _package
+        artifactName: runners
+        artifactType: container
+
+  ################################################################################
+  - job: build_linux_agent_arm
+  ################################################################################
+    displayName: Linux Agent (arm)
+    pool:
+      vmImage: ubuntu-16.04
+    steps:
+
+    # Steps template for non-windows platform
+    - template: nonwindows.template.yml
+      parameters:
+        targetRuntime: linux-arm
+
+    # Create agent package zip
+    - script: ./dev.sh package Release linux-arm
+      workingDirectory: src
+      displayName: Package Release
+
+    # Upload agent package zip as build artifact
+    - task: PublishBuildArtifacts@1
+      displayName: Publish Artifact (Linux)
+      inputs:
+        pathToPublish: _package
+        artifactName: runners
+        artifactType: container
+
+  ################################################################################
+  - job: build_osx_agent_x64
   ################################################################################
     displayName: macOS Agent (x64)
     pool:
@@ -74,9 +171,11 @@ stages:
 
     # Steps template for non-windows platform
     - template: nonwindows.template.yml
+      parameters:
+        targetRuntime: osx-x64
 
     # Create agent package zip
-    - script: ./dev.sh package Release
+    - script: ./dev.sh package Release osx-x64
       workingDirectory: src
       displayName: Package Release
 

nonwindows.template.yml

@@ -1,14 +1,18 @@
+parameters:
+  targetRuntime: ''
+
 steps:
 
 # Build agent layout
-- script: ./dev.sh layout Release
+- script: ./dev.sh layout Release ${{ parameters.targetRuntime }}
   workingDirectory: src
-  displayName: Build & Layout Release
+  displayName: Build & Layout Release ${{ parameters.targetRuntime }}
 
 # Run test
 - script: ./dev.sh test
   workingDirectory: src
   displayName: Test
+  condition: and(ne('${{ parameters.targetRuntime }}', 'linux-arm64'), ne('${{ parameters.targetRuntime }}', 'linux-arm'))
 
 # # Publish test results
 # - task: PublishTestResults@2

releaseNote.md

@@ -1,8 +1,8 @@
 ## Features
-  - N/A
+  - Add packages for Windows x86 (win-x6), Linux ARM32 (linux-arm), Linux ARM64 (linux-arm64)
 
 ## Bugs
-  - Fixed an issue with Strong Name Validation when running as a service on Windows (#185)
+  - N/A
 
 ## Misc
   - N/A
@@ -14,6 +14,8 @@
 | Windows x64 | [actions-runner-win-x64-<RUNNER_VERSION>.zip](https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-win-x64-<RUNNER_VERSION>.zip)      |
 | macOS   | [actions-runner-osx-x64-<RUNNER_VERSION>.tar.gz](https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-osx-x64-<RUNNER_VERSION>.tar.gz)   |
 | Linux x64  | [actions-runner-linux-x64-<RUNNER_VERSION>.tar.gz](https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-linux-x64-<RUNNER_VERSION>.tar.gz) |
+| Linux arm64  | [actions-runner-linux-arm64-<RUNNER_VERSION>.tar.gz](https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-linux-arm64-<RUNNER_VERSION>.tar.gz) |
+| Linux arm  | [actions-runner-linux-arm-<RUNNER_VERSION>.tar.gz](https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-linux-arm-<RUNNER_VERSION>.tar.gz) |
 
 After Download:  
 
@@ -37,3 +39,17 @@ C:\myagent> Add-Type -AssemblyName System.IO.Compression.FileSystem ; [System.IO
 ~/$ mkdir myagent && cd myagent
 ~/myagent$ tar xzf ~/Downloads/actions-runner-linux-x64-<RUNNER_VERSION>.tar.gz
 ```
+
+## Linux arm64
+
+``` bash
+~/$ mkdir myagent && cd myagent
+~/myagent$ tar xzf ~/Downloads/actions-runner-linux-arm64-<RUNNER_VERSION>.tar.gz
+```
+
+## Linux arm
+
+``` bash
+~/$ mkdir myagent && cd myagent
+~/myagent$ tar xzf ~/Downloads/actions-runner-linux-arm-<RUNNER_VERSION>.tar.gz
+```

src/Directory.Build.props

@@ -35,12 +35,12 @@
   <PropertyGroup Condition="'$(BUILD_OS)' == 'Linux' AND ('$(PackageRuntime)' == 'linux-x64' OR '$(PackageRuntime)' == '')">
     <DefineConstants>$(DefineConstants);X64</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(BUILD_OS)' == 'Linux' AND '$(PackageRuntime)' == 'rhel.6-x64'">
-    <DefineConstants>$(DefineConstants);X64</DefineConstants>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(BUILD_OS)' == 'Linux' AND '$(PackageRuntime)' == 'linux-arm'">
     <DefineConstants>$(DefineConstants);ARM</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(BUILD_OS)' == 'Linux' AND '$(PackageRuntime)' == 'linux-arm64'">
+    <DefineConstants>$(DefineConstants);ARM64</DefineConstants>
+  </PropertyGroup>
 
   <!-- Set TRACE/DEBUG vars -->
   <PropertyGroup>

src/Misc/externals.sh

@@ -123,9 +123,9 @@ function acquireExternalTool() {
 }
 
 # Download the external tools only for Windows.
-if [[ "$PACKAGERUNTIME" == "win-x64" ]]; then
+if [[ "$PACKAGERUNTIME" == "win-x64" || "$PACKAGERUNTIME" == "win-x86" ]]; then
-    acquireExternalTool "$NODE_URL/v${NODE12_VERSION}/win-x64/node.exe" node12/bin
+    acquireExternalTool "$NODE_URL/v${NODE12_VERSION}/$PACKAGERUNTIME/node.exe" node12/bin
-    acquireExternalTool "$NODE_URL/v${NODE12_VERSION}/win-x64/node.lib" node12/bin
+    acquireExternalTool "$NODE_URL/v${NODE12_VERSION}/$PACKAGERUNTIME/node.lib" node12/bin
     if [[ "$PRECACHE" != "" ]]; then
         acquireExternalTool "https://github.com/microsoft/vswhere/releases/download/2.6.7/vswhere.exe" vswhere
     fi
@@ -136,13 +136,23 @@ if [[ "$PACKAGERUNTIME" == "osx-x64" ]]; then
     acquireExternalTool "$NODE_URL/v${NODE12_VERSION}/node-v${NODE12_VERSION}-darwin-x64.tar.gz" node12 fix_nested_dir
 fi
 
-# Download the external tools common across Linux PACKAGERUNTIMEs (excluding OSX).
+# Download the external tools for Linux PACKAGERUNTIMEs.
 if [[ "$PACKAGERUNTIME" == "linux-x64" || "$PACKAGERUNTIME" == "rhel.6-x64" ]]; then
     acquireExternalTool "$NODE_URL/v${NODE12_VERSION}/node-v${NODE12_VERSION}-linux-x64.tar.gz" node12 fix_nested_dir
     # TODO: Repath this blob to use a consistent version format (_ vs .)
     acquireExternalTool "https://vstsagenttools.blob.core.windows.net/tools/nodejs/12_4_0/alpine/node-v${NODE12_VERSION}-alpine.tar.gz" node12_alpine
+    # acquireExternalTool "https://vstsagenttools.blob.core.windows.net/tools/nodejs/12.13.0/alpine/x64/node-v${NODE12_VERSION}-alpine-x64.tar.gz" node12_alpine
+fi
+
+if [[ "$PACKAGERUNTIME" == "linux-arm64" ]]; then
+    acquireExternalTool "$NODE_URL/v${NODE12_VERSION}/node-v${NODE12_VERSION}-linux-arm64.tar.gz" node12 fix_nested_dir
+    # TODO: alpine node runtime for arm64(8)
+    # acquireExternalTool "https://vstsagenttools.blob.core.windows.net/tools/nodejs/12.13.0/alpine/arm64/node-v${NODE12_VERSION}-alpine-arm64.tar.gz" node12_alpine
 fi
 
 if [[ "$PACKAGERUNTIME" == "linux-arm" ]]; then
     acquireExternalTool "$NODE_URL/v${NODE12_VERSION}/node-v${NODE12_VERSION}-linux-armv7l.tar.gz" node12 fix_nested_dir
+    # TODO: alpine node runtime for arm32(7)
+    # Need to set up custom gcc toolchain to cross compile on x64 ubuntu for armv7 (per https://github.com/nodejs/node/blob/master/BUILDING.md)
+    # acquireExternalTool "https://vstsagenttools.blob.core.windows.net/tools/nodejs/12.13.0/alpine/arm/node-v${NODE12_VERSION}-alpine-arm.tar.gz" node12_alpine
 fi

src/Runner.Common/Runner.Common.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <OutputType>Library</OutputType>
-    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm;rhel.6-x64;osx-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;rhel.6-x64;osx-x64</RuntimeIdentifiers>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <AssetTargetFallback>portable-net45+win8</AssetTargetFallback>
     <NoWarn>NU1701;NU1603</NoWarn>

src/Runner.Common/Util/VarUtil.cs

@@ -54,6 +54,8 @@ namespace GitHub.Runner.Common.Util
                         return "X64";
                     case Constants.Architecture.Arm:
                         return "ARM";
+                    case Constants.Architecture.Arm64:
+                        return "ARM64";
                     default:
                         throw new NotSupportedException(); // Should never reach here.
                 }

src/Runner.Listener/Runner.Listener.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <OutputType>Exe</OutputType>
-    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm;rhel.6-x64;osx-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;rhel.6-x64;osx-x64</RuntimeIdentifiers>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <AssetTargetFallback>portable-net45+win8</AssetTargetFallback>
     <NoWarn>NU1701;NU1603</NoWarn>

src/Runner.PluginHost/Runner.PluginHost.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <OutputType>Exe</OutputType>
-    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm;rhel.6-x64;osx-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;rhel.6-x64;osx-x64</RuntimeIdentifiers>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <AssetTargetFallback>portable-net45+win8</AssetTargetFallback>
     <NoWarn>NU1701;NU1603</NoWarn>

src/Runner.Plugins/Runner.Plugins.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <OutputType>Library</OutputType>
-    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm;rhel.6-x64;osx-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;rhel.6-x64;osx-x64</RuntimeIdentifiers>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <AssetTargetFallback>portable-net45+win8</AssetTargetFallback>
     <NoWarn>NU1701;NU1603</NoWarn>

src/Runner.Sdk/Runner.Sdk.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <OutputType>Library</OutputType>
-    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm;rhel.6-x64;osx-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;rhel.6-x64;osx-x64</RuntimeIdentifiers>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <AssetTargetFallback>portable-net45+win8</AssetTargetFallback>
     <NoWarn>NU1701;NU1603</NoWarn>

src/Runner.Worker/Runner.Worker.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <OutputType>Exe</OutputType>
-    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm;rhel.6-x64;osx-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;rhel.6-x64;osx-x64</RuntimeIdentifiers>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <AssetTargetFallback>portable-net45+win8</AssetTargetFallback>
     <NoWarn>NU1701;NU1603</NoWarn>

src/Sdk/Sdk.csproj

@@ -3,7 +3,7 @@
     <PropertyGroup>
         <TargetFramework>netcoreapp3.0</TargetFramework>
         <OutputType>Library</OutputType>
-        <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm;rhel.6-x64;osx-x64</RuntimeIdentifiers>
+        <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;rhel.6-x64;osx-x64</RuntimeIdentifiers>
         <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
         <AssetTargetFallback>portable-net45+win8</AssetTargetFallback>
         <NoWarn>NU1701;NU1603</NoWarn>

src/Test/L0/ConstantGenerationL0.cs

@@ -18,6 +18,7 @@ namespace GitHub.Runner.Common.Tests
                 "win-x86",
                 "linux-x64",
                 "linux-arm",
+                "linux-arm64",
                 "rhel.6-x64",
                 "osx-x64"
             };

src/Test/Test.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>netcoreapp3.0</TargetFramework>
-        <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm;rhel.6-x64;osx-x64</RuntimeIdentifiers>
+        <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;rhel.6-x64;osx-x64</RuntimeIdentifiers>
         <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
         <AssetTargetFallback>portable-net45+win8</AssetTargetFallback>
         <NoWarn>NU1701;NU1603;NU1603;xUnit2013;</NoWarn>

src/dev.sh

@@ -10,6 +10,7 @@ set -e
 
 DEV_CMD=$1
 DEV_CONFIG=$2
+DEV_TARGET_RUNTIME=$3
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 LAYOUT_DIR="$SCRIPT_DIR/../_layout"
@@ -43,7 +44,7 @@ elif [[ "$CURRENT_PLATFORM" == 'linux' ]]; then
         CPU_NAME=$(uname -m)
         case $CPU_NAME in
             armv7l) RUNTIME_ID="linux-arm";;
-         aarch64) RUNTIME_ID="linux-arm";;
+            aarch64) RUNTIME_ID="linux-arm64";;
         esac
     fi
 
@@ -53,11 +54,14 @@ elif [[ "$CURRENT_PLATFORM" == 'linux' ]]; then
             RUNTIME_ID='rhel.6-x64'
         fi
     fi
-   
 elif [[ "$CURRENT_PLATFORM" == 'darwin' ]]; then
     RUNTIME_ID='osx-x64'
 fi
 
+if [[ -n "$DEV_TARGET_RUNTIME" ]]; then
+    RUNTIME_ID="$DEV_TARGET_RUNTIME"
+fi
+
 # Make sure current platform support publish the dotnet runtime
 # Windows can publish win-x86/x64
 # Linux can publish linux-x64/arm/rhel.6-x64
@@ -68,7 +72,7 @@ if [[ "$CURRENT_PLATFORM" == 'windows' ]]; then
         exit 1
     fi
 elif [[ "$CURRENT_PLATFORM" == 'linux' ]]; then
-   if [[ ("$RUNTIME_ID" != 'linux-x64') && ("$RUNTIME_ID" != 'linux-arm') && ("$RUNTIME_ID" != 'rhel.6-x64') ]]; then
+    if [[ ("$RUNTIME_ID" != 'linux-x64') && ("$RUNTIME_ID" != 'linux-x86') && ("$RUNTIME_ID" != 'linux-arm64') && ("$RUNTIME_ID" != 'linux-arm') && ("$RUNTIME_ID" != 'rhel.6-x64') ]]; then
        echo "Failed: Can't build $RUNTIME_ID package $CURRENT_PLATFORM" >&2
        exit 1
     fi
@@ -151,7 +155,8 @@ function package ()
         echo "You must build first.  Expecting to find ${LAYOUT_DIR}/bin"
     fi
 
-    runner_ver=$("${LAYOUT_DIR}/bin/Runner.Listener" --version) || failed "version"
+    # TODO: We are cross-compiling arm on x64 so we cant exec Runner.Listener. Remove after building on native arm host
+    runner_ver=$("${LAYOUT_DIR}/bin/Runner.Listener" --version) || runner_ver=$(cat runnerversion) || failed "version"
     runner_pkg_name="actions-runner-${RUNTIME_ID}-${runner_ver}"
 
     heading "Packaging ${runner_pkg_name}"

src/runnerversion

@@ -1 +1 @@
-2.160.2
+2.161.0

windows.template.yml

@@ -1,9 +1,12 @@
+parameters:
+  targetRuntime: ''
+
 steps:
 
 # Build agent layout
-- script: dev.cmd layout Release
+- script: dev.cmd layout Release ${{ parameters.targetRuntime }}
   workingDirectory: src
-  displayName: Build & Layout Release
+  displayName: Build & Layout Release ${{ parameters.targetRuntime }}
 
 # Run test
 - script: dev.cmd test