New arch is a feature

Dont release x86 until we have an e2e test machine
This commit is contained in:
David Kale
2019-11-11 15:02:12 -05:00
parent d46e92e9bb
commit 215f78888a
4 changed files with 43 additions and 56 deletions

View File

@@ -13,7 +13,8 @@ jobs:
build: build:
strategy: strategy:
matrix: matrix:
runtime: [ linux-x64, linux-arm64, linux-arm, win-x64, win-x86, osx-x64 ] 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: include:
- runtime: linux-x64 - runtime: linux-x64
os: ubuntu-latest os: ubuntu-latest
@@ -35,9 +36,9 @@ jobs:
os: windows-latest os: windows-latest
devScript: ./dev devScript: ./dev
- runtime: win-x86 # - runtime: win-x86
os: windows-latest # os: windows-latest
devScript: ./dev # devScript: ./dev
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:

View File

@@ -5,12 +5,6 @@
"version": "<RUNNER_VERSION>", "version": "<RUNNER_VERSION>",
"downloadUrl": "https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-win-x64-<RUNNER_VERSION>.zip" "downloadUrl": "https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-win-x64-<RUNNER_VERSION>.zip"
}, },
{
"name": "actions-runner-win-x86-<RUNNER_VERSION>.zip",
"platform": "win-x86",
"version": "<RUNNER_VERSION>",
"downloadUrl": "https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-win-x86-<RUNNER_VERSION>.zip"
},
{ {
"name": "actions-runner-osx-x64-<RUNNER_VERSION>.tar.gz", "name": "actions-runner-osx-x64-<RUNNER_VERSION>.tar.gz",
"platform": "osx-x64", "platform": "osx-x64",

View File

@@ -42,46 +42,46 @@ stages:
artifactName: runners artifactName: runners
artifactType: container artifactType: container
################################################################################ # ################################################################################
- job: build_windows_agent_x86 # - job: build_windows_agent_x86
################################################################################ # ################################################################################
displayName: Windows Agent (x86) # displayName: Windows Agent (x86)
pool: # pool:
vmImage: vs2017-win2016 # vmImage: vs2017-win2016
steps: # steps:
# Steps template for windows platform # # Steps template for windows platform
- template: windows.template.yml # - template: windows.template.yml
parameters: # parameters:
targetRuntime: win-x86 # targetRuntime: win-x86
# Package dotnet core windows dependency (VC++ Redistributable) # # Package dotnet core windows dependency (VC++ Redistributable)
- powershell: | # - powershell: |
Write-Host "Downloading 'VC++ Redistributable' package." # Write-Host "Downloading 'VC++ Redistributable' package."
$outDir = Join-Path -Path $env:TMP -ChildPath ([Guid]::NewGuid()) # $outDir = Join-Path -Path $env:TMP -ChildPath ([Guid]::NewGuid())
New-Item -Path $outDir -ItemType directory # New-Item -Path $outDir -ItemType directory
$outFile = Join-Path -Path $outDir -ChildPath "ucrt.zip" # $outFile = Join-Path -Path $outDir -ChildPath "ucrt.zip"
Invoke-WebRequest -Uri https://vstsagenttools.blob.core.windows.net/tools/ucrt/ucrt_x86.zip -OutFile $outFile # 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." # Write-Host "Unzipping 'VC++ Redistributable' package to agent layout."
$unzipDir = Join-Path -Path $outDir -ChildPath "unzip" # $unzipDir = Join-Path -Path $outDir -ChildPath "unzip"
Add-Type -AssemblyName System.IO.Compression.FileSystem # Add-Type -AssemblyName System.IO.Compression.FileSystem
[System.IO.Compression.ZipFile]::ExtractToDirectory($outFile, $unzipDir) # [System.IO.Compression.ZipFile]::ExtractToDirectory($outFile, $unzipDir)
$agentLayoutBin = Join-Path -Path $(Build.SourcesDirectory) -ChildPath "_layout\bin" # $agentLayoutBin = Join-Path -Path $(Build.SourcesDirectory) -ChildPath "_layout\bin"
Copy-Item -Path $unzipDir -Destination $agentLayoutBin -Force # Copy-Item -Path $unzipDir -Destination $agentLayoutBin -Force
displayName: Package UCRT # displayName: Package UCRT
# Create agent package zip # # Create agent package zip
- script: dev.cmd package Release win-x86 # - script: dev.cmd package Release win-x86
workingDirectory: src # workingDirectory: src
displayName: Package Release # displayName: Package Release
# Upload agent package zip as build artifact # # Upload agent package zip as build artifact
- task: PublishBuildArtifacts@1 # - task: PublishBuildArtifacts@1
displayName: Publish Artifact (Windows) # displayName: Publish Artifact (Windows)
inputs: # inputs:
pathToPublish: _package # pathToPublish: _package
artifactName: runners # artifactName: runners
artifactType: container # artifactType: container
################################################################################ ################################################################################
- job: build_linux_agent_x64 - job: build_linux_agent_x64

View File

@@ -1,18 +1,17 @@
## Features ## Features
- N/A - Add packages for Windows x86 (win-x6), Linux ARM32 (linux-arm), Linux ARM64 (linux-arm64)
## Bugs ## Bugs
- N/A - N/A
## Misc ## Misc
- Add packages for Windows x86 (win-x6), Linux ARM32 (linux-arm), Linux ARM64 (linux-arm64) - N/A
## Agent Downloads ## Agent Downloads
| | Package | | | Package |
| ------- | ----------------------------------------------------------------------------------------------------------- | | ------- | ----------------------------------------------------------------------------------------------------------- |
| Windows x64 | [actions-runner-win-x64-<RUNNER_VERSION>.zip](https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-win-x64-<RUNNER_VERSION>.zip) | | Windows x64 | [actions-runner-win-x64-<RUNNER_VERSION>.zip](https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-win-x64-<RUNNER_VERSION>.zip) |
| Windows x86 | [actions-runner-win-x86-<RUNNER_VERSION>.zip](https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-win-x86-<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) | | 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 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 arm64 | [actions-runner-linux-arm64-<RUNNER_VERSION>.tar.gz](https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-linux-arm64-<RUNNER_VERSION>.tar.gz) |
@@ -27,13 +26,6 @@ C:\> mkdir myagent && cd myagent
C:\myagent> Add-Type -AssemblyName System.IO.Compression.FileSystem ; [System.IO.Compression.ZipFile]::ExtractToDirectory("$HOME\Downloads\actions-runner-win-x64-<RUNNER_VERSION>.zip", "$PWD") C:\myagent> Add-Type -AssemblyName System.IO.Compression.FileSystem ; [System.IO.Compression.ZipFile]::ExtractToDirectory("$HOME\Downloads\actions-runner-win-x64-<RUNNER_VERSION>.zip", "$PWD")
``` ```
## Windows x86
``` bash
C:\> mkdir myagent && cd myagent
C:\myagent> Add-Type -AssemblyName System.IO.Compression.FileSystem ; [System.IO.Compression.ZipFile]::ExtractToDirectory("$HOME\Downloads\actions-runner-win-x86-<RUNNER_VERSION>.zip", "$PWD")
```
## OSX ## OSX
``` bash ``` bash