From 9a08f7418f34d962664e263f2222d638846086ff Mon Sep 17 00:00:00 2001 From: Tingluo Huang Date: Wed, 18 Dec 2019 15:28:36 -0500 Subject: [PATCH] delete unused files. (#235) --- assets.json | 32 ----- azure-pipelines-release.yml | 237 ------------------------------------ azure-pipelines.yml | 95 --------------- docs/contribute.md | 8 +- nonwindows.template.yml | 33 ----- releaseNote.md | 22 ++-- src/runnerversion | 2 +- windows.template.yml | 32 ----- 8 files changed, 16 insertions(+), 445 deletions(-) delete mode 100644 assets.json delete mode 100644 azure-pipelines-release.yml delete mode 100644 azure-pipelines.yml delete mode 100644 nonwindows.template.yml delete mode 100644 windows.template.yml diff --git a/assets.json b/assets.json deleted file mode 100644 index 138f58f62c9..00000000000 --- a/assets.json +++ /dev/null @@ -1,32 +0,0 @@ -[ - { - "name": "actions-runner-win-x64-.zip", - "platform": "win-x64", - "version": "", - "downloadUrl": "https://githubassets.azureedge.net/runners//actions-runner-win-x64-.zip" - }, - { - "name": "actions-runner-osx-x64-.tar.gz", - "platform": "osx-x64", - "version": "", - "downloadUrl": "https://githubassets.azureedge.net/runners//actions-runner-osx-x64-.tar.gz" - }, - { - "name": "actions-runner-linux-x64-.tar.gz", - "platform": "linux-x64", - "version": "", - "downloadUrl": "https://githubassets.azureedge.net/runners//actions-runner-linux-x64-.tar.gz" - }, - { - "name": "actions-runner-linux-arm64-.tar.gz", - "platform": "linux-arm64", - "version": "", - "downloadUrl": "https://githubassets.azureedge.net/runners//actions-runner-linux-arm64-.tar.gz" - }, - { - "name": "actions-runner-linux-arm-.tar.gz", - "platform": "linux-arm", - "version": "", - "downloadUrl": "https://githubassets.azureedge.net/runners//actions-runner-linux-arm-.tar.gz" - } -] \ No newline at end of file diff --git a/azure-pipelines-release.yml b/azure-pipelines-release.yml deleted file mode 100644 index 12c18148159..00000000000 --- a/azure-pipelines-release.yml +++ /dev/null @@ -1,237 +0,0 @@ -stages: -- stage: Build - jobs: - ################################################################################ - - job: build_windows_agent_x64 - ################################################################################ - displayName: Windows Agent (x64) - pool: - vmImage: vs2017-win2016 - steps: - - # Steps template for windows platform - - template: windows.template.yml - parameters: - targetRuntime: win-x64 - - # 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_x64.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-x64 - workingDirectory: src - displayName: Package Release - - # Upload agent package zip as build artifact - - task: PublishBuildArtifacts@1 - displayName: Publish Artifact (Windows x64) - inputs: - pathToPublish: _package - artifactName: runners - artifactType: container - - ################################################################################ - - job: build_linux_agent_x64 - ################################################################################ - displayName: Linux Agent (x64) - pool: - vmImage: ubuntu-16.04 - steps: - - # Steps template for non-windows platform - - template: nonwindows.template.yml - parameters: - targetRuntime: linux-x64 - - # Create agent package zip - - script: ./dev.sh package Release linux-x64 - workingDirectory: src - displayName: Package Release - - # Upload agent package zip as build artifact - - task: PublishBuildArtifacts@1 - displayName: Publish Artifact (Linux x64) - inputs: - pathToPublish: _package - artifactName: runners - artifactType: container - - ################################################################################ - - 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 ARM64) - 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 ARM) - inputs: - pathToPublish: _package - artifactName: runners - artifactType: container - - ################################################################################ - - job: build_osx_agent_x64 - ################################################################################ - displayName: macOS Agent (x64) - pool: - vmImage: macOS-10.13 - steps: - - # Steps template for non-windows platform - - template: nonwindows.template.yml - parameters: - targetRuntime: osx-x64 - - # Create agent package zip - - script: ./dev.sh package Release osx-x64 - workingDirectory: src - displayName: Package Release - - # Upload agent package zip as build artifact - - task: PublishBuildArtifacts@1 - displayName: Publish Artifact (OSX x64) - inputs: - pathToPublish: _package - artifactName: runners - artifactType: container - -- stage: Release - dependsOn: Build - jobs: - ################################################################################ - - job: publish_agent_packages - ################################################################################ - displayName: Publish Agents (Windows/Linux/OSX) - pool: - name: ProductionRMAgents - steps: - - # Download all agent packages from all previous phases - - task: DownloadBuildArtifacts@0 - displayName: Download Agent Packages - inputs: - artifactName: runners - - # Upload agent packages to Azure blob storage and refresh Azure CDN - - powershell: | - Write-Host "Preloading Azure modules." # This is for better performance, to avoid module-autoloading. - Import-Module AzureRM, AzureRM.profile, AzureRM.Storage, Azure.Storage, AzureRM.Cdn -ErrorAction Ignore -PassThru - Enable-AzureRmAlias -Scope CurrentUser - $uploadFiles = New-Object System.Collections.ArrayList - $certificateThumbprint = (Get-ItemProperty -Path "$(ServicePrincipalReg)").ServicePrincipalCertThumbprint - $clientId = (Get-ItemProperty -Path "$(ServicePrincipalReg)").ServicePrincipalClientId - Write-Host "##vso[task.setsecret]$certificateThumbprint" - Write-Host "##vso[task.setsecret]$clientId" - Login-AzureRmAccount -ServicePrincipal -CertificateThumbprint $certificateThumbprint -ApplicationId $clientId -TenantId $(GitHubTenantId) - Select-AzureRmSubscription -SubscriptionId $(GitHubSubscriptionId) - $storage = Get-AzureRmStorageAccount -ResourceGroupName githubassets -AccountName githubassets - Get-ChildItem -LiteralPath "$(System.ArtifactsDirectory)/runners" | ForEach-Object { - $versionDir = $_.Name.Trim('.zip').Trim('.tar.gz') - $versionDir = $versionDir.SubString($versionDir.LastIndexOf('-') + 1) - Write-Host "##vso[task.setvariable variable=ReleaseAgentVersion;]$versionDir" - Write-Host "Uploading $_ to BlobStorage githubassets/runners/$versionDir" - Set-AzureStorageBlobContent -Context $storage.Context -Container runners -File "$(System.ArtifactsDirectory)/runners/$_" -Blob "$versionDir/$_" -Force - $uploadFiles.Add("/runners/$versionDir/$_") - } - Write-Host "Get CDN info" - Get-AzureRmCdnEndpoint -ProfileName githubassets -ResourceGroupName githubassets - Write-Host "Purge Azure CDN Cache" - Unpublish-AzureRmCdnEndpointContent -EndpointName githubassets -ProfileName githubassets -ResourceGroupName githubassets -PurgeContent $uploadFiles - Write-Host "Pull assets through Azure CDN" - $uploadFiles | ForEach-Object { - $downloadUrl = "https://githubassets.azureedge.net" + $_ - Write-Host $downloadUrl - Invoke-WebRequest -Uri $downloadUrl -OutFile $_.SubString($_.LastIndexOf('/') + 1) - } - displayName: Upload to Azure Blob - - # Create agent release on Github - - powershell: | - Write-Host "Creating github release." - $releaseNotes = [System.IO.File]::ReadAllText("$(Build.SourcesDirectory)\releaseNote.md").Replace("","$(ReleaseAgentVersion)") - $releaseData = @{ - tag_name = "v$(ReleaseAgentVersion)"; - target_commitish = "$(Build.SourceVersion)"; - name = "v$(ReleaseAgentVersion)"; - body = $releaseNotes; - draft = $false; - prerelease = $true; - } - $releaseParams = @{ - Uri = "https://api.github.com/repos/actions/runner/releases"; - Method = 'POST'; - Headers = @{ - Authorization = 'Basic ' + [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes("github:$(GithubToken)")); - } - ContentType = 'application/json'; - Body = (ConvertTo-Json $releaseData -Compress) - } - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 - $releaseCreated = Invoke-RestMethod @releaseParams - Write-Host $releaseCreated - $releaseId = $releaseCreated.id - Get-ChildItem -LiteralPath "$(System.ArtifactsDirectory)/runners" | ForEach-Object { - Write-Host "Uploading $_ as GitHub release assets" - $assetsParams = @{ - Uri = "https://uploads.github.com/repos/actions/runner/releases/$releaseId/assets?name=$($_.Name)" - Method = 'POST'; - Headers = @{ - Authorization = 'Basic ' + [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes("github:$(GithubToken)")); - } - ContentType = 'application/octet-stream'; - Body = [System.IO.File]::ReadAllBytes($_.FullName) - } - Invoke-RestMethod @assetsParams - } - displayName: Create agent release on Github diff --git a/azure-pipelines.yml b/azure-pipelines.yml deleted file mode 100644 index 8706b1fb89c..00000000000 --- a/azure-pipelines.yml +++ /dev/null @@ -1,95 +0,0 @@ -jobs: - -################################################################################ -- job: build_windows_x64_agent -################################################################################ - displayName: Windows Agent (x64) - pool: - vmImage: vs2017-win2016 - steps: - - # Steps template for windows platform - - template: windows.template.yml - - # 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_x64.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 - condition: and(succeeded(), ne(variables['build.reason'], 'PullRequest')) - - # Create agent package zip - - script: dev.cmd package Release - workingDirectory: src - displayName: Package Release - condition: and(succeeded(), ne(variables['build.reason'], 'PullRequest')) - - # Upload agent package zip as build artifact - - task: PublishBuildArtifacts@1 - displayName: Publish Artifact (Windows x64) - condition: and(succeeded(), ne(variables['build.reason'], 'PullRequest')) - inputs: - pathToPublish: _package - artifactName: agent - artifactType: container - -################################################################################ -- job: build_linux_x64_agent -################################################################################ - displayName: Linux Agent (x64) - pool: - vmImage: ubuntu-16.04 - steps: - - # Steps template for non-windows platform - - template: nonwindows.template.yml - - # Create agent package zip - - script: ./dev.sh package Release - workingDirectory: src - displayName: Package Release - condition: and(succeeded(), ne(variables['build.reason'], 'PullRequest')) - - # Upload agent package zip as build artifact - - task: PublishBuildArtifacts@1 - displayName: Publish Artifact (Linux x64) - condition: and(succeeded(), ne(variables['build.reason'], 'PullRequest')) - inputs: - pathToPublish: _package - artifactName: agent - artifactType: container - -################################################################################ -- job: build_osx_agent -################################################################################ - displayName: macOS Agent (x64) - pool: - vmImage: macOS-10.14 - steps: - - # Steps template for non-windows platform - - template: nonwindows.template.yml - - # Create agent package zip - - script: ./dev.sh package Release - workingDirectory: src - displayName: Package Release - condition: and(succeeded(), ne(variables['build.reason'], 'PullRequest')) - - # Upload agent package zip as build artifact - - task: PublishBuildArtifacts@1 - displayName: Publish Artifact (OSX) - condition: and(succeeded(), ne(variables['build.reason'], 'PullRequest')) - inputs: - pathToPublish: _package - artifactName: agent - artifactType: container diff --git a/docs/contribute.md b/docs/contribute.md index 2a0f8844861..f42e95f4808 100644 --- a/docs/contribute.md +++ b/docs/contribute.md @@ -14,16 +14,16 @@ Navigate to the `src` directory and run the following command: **Commands:** -* `layout` (`l`): Run first time to create a full agent layout in `{root}/_layout` -* `build` (`b`): Build everything and update agent layout folder -* `test` (`t`): Build agent binaries and run unit tests +* `layout` (`l`): Run first time to create a full runner layout in `{root}/_layout` +* `build` (`b`): Build everything and update runner layout folder +* `test` (`t`): Build runner binaries and run unit tests Sample developer flow: ```bash git clone https://github.com/actions/runner cd ./src -./dev.(sh/cmd) layout # the agent that build from source is in {root}/_layout +./dev.(sh/cmd) layout # the runner that build from source is in {root}/_layout ./dev.(sh/cmd) build # {root}/_layout will get updated ./dev.(sh/cmd) test # run all unit tests before git commit/push diff --git a/nonwindows.template.yml b/nonwindows.template.yml deleted file mode 100644 index ac312f78ece..00000000000 --- a/nonwindows.template.yml +++ /dev/null @@ -1,33 +0,0 @@ -parameters: - targetRuntime: '' - -steps: - -# Build agent layout -- script: ./dev.sh layout Release ${{ parameters.targetRuntime }} - workingDirectory: src - 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 -# displayName: Publish Test Results **/*.trx -# condition: always() -# inputs: -# testRunner: VSTest -# testResultsFiles: '**/*.trx' -# testRunTitle: 'Agent Tests' - -# # Upload test log -# - task: PublishBuildArtifacts@1 -# displayName: Publish Test logs -# condition: always() -# inputs: -# pathToPublish: src/Test/TestLogs -# artifactName: $(System.JobId) -# artifactType: container diff --git a/releaseNote.md b/releaseNote.md index 5d553bca162..308408adf9d 100644 --- a/releaseNote.md +++ b/releaseNote.md @@ -1,14 +1,14 @@ ## Features - - Added Proxy Support for self-hosted runner. (#206) - - Introduce `--name` configure argument for runner name. (#217) - - Better repo matching for issue file path (checkout v2 related) (#208) + - Remove runner flow: Change from PAT to "deletion token" in prompt (#225) + - Expose github.run_id and github.run_number to action runtime env. (#224) ## Bugs - - N/A + - Clean up error messages for container scenarios (#221) + - Pick shell from prependpath (#231) ## Misc - - Runner code cleanup (#197, #209, #214, #219) - - Update node external to 12.13.1 (#215) + - Runner code cleanup (#218 #227, #228, #229, #230) + - Consume dotnet core 3.1 in runner. (#213) ## Windows x64 We recommend configuring the runner under ":\actions-runner". This will help avoid issues related to service identity folder permissions and long file path restrictions on Windows @@ -16,7 +16,7 @@ We recommend configuring the runner under ":\actions-runner". This will h // Create a folder under the drive root mkdir \actions-runner ; cd \actions-runner // Download the latest runner package -Invoke-WebRequest -Uri https://githubassets.azureedge.net/runners//actions-runner-win-x64-.zip -OutFile actions-runner-win-x64-.zip +Invoke-WebRequest -Uri https://github.com/actions/runner/releases/download/v/actions-runner-win-x64-.zip -OutFile actions-runner-win-x64-.zip // Extract the installer Add-Type -AssemblyName System.IO.Compression.FileSystem ; [System.IO.Compression.ZipFile]::ExtractToDirectory("$HOME\Downloads\actions-runner-win-x64-.zip", "$PWD") @@ -28,7 +28,7 @@ Add-Type -AssemblyName System.IO.Compression.FileSystem ; // Create a folder mkdir actions-runner && cd actions-runner // Download the latest runner package -curl -O https://githubassets.azureedge.net/runners//actions-runner-osx-x64-.tar.gz +curl -O https://github.com/actions/runner/releases/download/v/actions-runner-osx-x64-.tar.gz // Extract the installer tar xzf ./actions-runner-osx-x64-.tar.gz ``` @@ -39,7 +39,7 @@ tar xzf ./actions-runner-osx-x64-.tar.gz // Create a folder mkdir actions-runner && cd actions-runner // Download the latest runner package -curl -O https://githubassets.azureedge.net/runners//actions-runner-linux-x64-.tar.gz +curl -O https://github.com/actions/runner/releases/download/v/actions-runner-linux-x64-.tar.gz // Extract the installer tar xzf ./actions-runner-linux-x64-.tar.gz ``` @@ -50,7 +50,7 @@ tar xzf ./actions-runner-linux-x64-.tar.gz // Create a folder mkdir actions-runner && cd actions-runner // Download the latest runner package -curl -O https://githubassets.azureedge.net/runners//actions-runner-linux-arm64-.tar.gz +curl -O https://github.com/actions/runner/releases/download/v/actions-runner-linux-arm64-.tar.gz // Extract the installer tar xzf ./actions-runner-linux-arm64-.tar.gz ``` @@ -61,7 +61,7 @@ tar xzf ./actions-runner-linux-arm64-.tar.gz // Create a folder mkdir actions-runner && cd actions-runner // Download the latest runner package -curl -O https://githubassets.azureedge.net/runners//actions-runner-linux-arm-.tar.gz +curl -O https://github.com/actions/runner/releases/download/v/actions-runner-linux-arm-.tar.gz // Extract the installer tar xzf ./actions-runner-linux-arm-.tar.gz ``` diff --git a/src/runnerversion b/src/runnerversion index 02391d94810..8164268dacd 100644 --- a/src/runnerversion +++ b/src/runnerversion @@ -1 +1 @@ -2.163.0 +2.164.0 diff --git a/windows.template.yml b/windows.template.yml deleted file mode 100644 index aea50010702..00000000000 --- a/windows.template.yml +++ /dev/null @@ -1,32 +0,0 @@ -parameters: - targetRuntime: '' - -steps: - -# Build agent layout -- script: dev.cmd layout Release ${{ parameters.targetRuntime }} - workingDirectory: src - displayName: Build & Layout Release ${{ parameters.targetRuntime }} - -# Run test -- script: dev.cmd test - workingDirectory: src - displayName: Test - -# # Publish test results -# - task: PublishTestResults@2 -# displayName: Publish Test Results **/*.trx -# condition: always() -# inputs: -# testRunner: VSTest -# testResultsFiles: '**/*.trx' -# testRunTitle: 'Agent Tests' - -# # Upload test log -# - task: PublishBuildArtifacts@1 -# displayName: Publish Test logs -# condition: always() -# inputs: -# pathToPublish: src/Test/TestLogs -# artifactName: $(System.JobId) -# artifactType: container