Skip to content

Remove appveyor.yml from V2 #2900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 14, 2022
Merged

Remove appveyor.yml from V2 #2900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6484a78
Removed appveyor references from the build pipeline
michaelpeng36 Jan 11, 2022
0c09329
Replaced Invoke-Expression to &{} and corrected an exception's message
michaelpeng36 Jan 12, 2022
6b40c84
Remove quotes from commands
michaelpeng36 Jan 12, 2022
9c419e8
Removed quotations from build command
michaelpeng36 Jan 12, 2022
ae88d87
Altered so it would run
michaelpeng36 Jan 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
|---|---|
|master|[![Build Status](https://azfunc.visualstudio.com/Azure%20Functions/_apis/build/status/azure-functions-core-tools?branchName=master)](https://azfunc.visualstudio.com/Azure%20Functions/_build/latest?definitionId=11&branchName=master)
|dev|[![Build Status](https://azfunc.visualstudio.com/Azure%20Functions/_apis/build/status/azure-functions-core-tools?branchName=dev)](https://azfunc.visualstudio.com/Azure%20Functions/_build/latest?definitionId=11&branchName=dev)
|v1.x|[![Build status](https://ci.appveyor.com/api/projects/status/max86pwo54y44j36/branch/v1.x?svg=true)](https://ci.appveyor.com/project/appsvc/azure-functions-cli/branch/v1.x)|
|v1.x|[![Build status](https://azfunc.visualstudio.com/Azure%20Functions/_apis/build/status/azure-functions-core-tools?branchName=v1.x)](https://azfunc.visualstudio.com/Azure%20Functions/_build/latest?definitionId=11&branchName=v1.x)|

# Azure Functions Core Tools

Expand Down
23 changes: 0 additions & 23 deletions appveyor.yml
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ pool:

variables:
devops_buildNumber: $[counter(format(''), 1500)]
APPVEYOR_REPO_BRANCH: $[coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranchName'])]
APPVEYOR_REPO_COMMIT: $(Build.SourceVersion)
DEVOPS_REPO_BRANCH: $[coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranchName'])]
DEVOPS_REPO_COMMIT: $(Build.SourceVersion)

steps:
- pwsh: |
Expand All @@ -32,7 +32,7 @@ steps:
env:
BuildSourceBranchName: $(Build.SourceBranchName)
- pwsh: |
Write-Host "Target branch: '$(APPVEYOR_REPO_BRANCH)'"
Write-Host "Target branch: '$(DEVOPS_REPO_BRANCH)'"
displayName: Set up environment variables
- task: NodeTool@0
inputs:
Expand Down
26 changes: 13 additions & 13 deletions build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
if ($env:APPVEYOR_REPO_BRANCH -eq "disabled") {
if ($env:DEVOPS_REPO_BRANCH -eq "disabled") {
Set-Location ".\src\Azure.Functions.Cli"
$result = Invoke-Expression -Command "NuGet list Microsoft.Azure.Functions.JavaWorker -Source https://ci.appveyor.com/NuGet/azure-functions-java-worker-fejnnsvmrkqg -PreRelease"
$result = & { NuGet list Microsoft.Azure.Functions.JavaWorker -Source https://ci.appveyor.com/NuGet/azure-functions-java-worker-fejnnsvmrkqg -PreRelease }
$javaWorkerVersion = $result.Split()[1]
Write-host "Adding Microsoft.Azure.Functions.JavaWorker $javaWorkerVersion to project" -ForegroundColor Green
Invoke-Expression -Command "dotnet add package Microsoft.Azure.Functions.JavaWorker -v $javaWorkerVersion -s https://ci.appveyor.com/NuGet/azure-functions-java-worker-fejnnsvmrkqg"
& { dotnet add package Microsoft.Azure.Functions.JavaWorker -v $javaWorkerVersion -s https://ci.appveyor.com/NuGet/azure-functions-java-worker-fejnnsvmrkqg }

$result = Invoke-Expression -Command "NuGet list Microsoft.Azure.Functions.PowerShellWorker -Source https://ci.appveyor.com/nuget/azure-functions-powershell-wor-0842fakagqy6 -PreRelease"
$result = & { NuGet list Microsoft.Azure.Functions.PowerShellWorker -Source https://ci.appveyor.com/nuget/azure-functions-powershell-wor-0842fakagqy6 -PreRelease }
$powerShellWorkerVersion = $result.Split()[1]
Write-host "Adding Microsoft.Azure.Functions.PowerShellWorker $powerShellWorkerVersion to project" -ForegroundColor Green
Invoke-Expression -Command "dotnet add package Microsoft.Azure.Functions.PowerShellWorker -v $powerShellWorkerVersion -s https://ci.appveyor.com/nuget/azure-functions-powershell-wor-0842fakagqy6"
& { dotnet add package Microsoft.Azure.Functions.PowerShellWorker -v $powerShellWorkerVersion -s https://ci.appveyor.com/nuget/azure-functions-powershell-wor-0842fakagqy6 }

$result = Invoke-Expression -Command "NuGet list Microsoft.Azure.Functions.NodeJsWorker -Source https://ci.appveyor.com/nuget/azure-functions-nodejs-worker-0fcvx371y52p -PreRelease"
$result = & { NuGet list Microsoft.Azure.Functions.NodeJsWorker -Source https://ci.appveyor.com/nuget/azure-functions-nodejs-worker-0fcvx371y52p -PreRelease }
$nodeJsWorkerVersion = $result.Split()[1]
Write-host "Adding Microsoft.Azure.Functions.NodeJsWorker $nodeJsWorkerVersion to project" -ForegroundColor Green
Invoke-Expression -Command "dotnet add package Microsoft.Azure.Functions.NodeJsWorker -v $nodeJsWorkerVersion -s https://ci.appveyor.com/nuget/azure-functions-nodejs-worker-0fcvx371y52p"
& { dotnet add package Microsoft.Azure.Functions.NodeJsWorker -v $nodeJsWorkerVersion -s https://ci.appveyor.com/nuget/azure-functions-nodejs-worker-0fcvx371y52p }

$result = Invoke-Expression -Command "NuGet list Microsoft.Azure.WebJobs.Script.WebHost -Source https://ci.appveyor.com/NuGet/azure-webjobs-sdk-script-g6rygw981l9t -PreRelease"
$result = & { NuGet list Microsoft.Azure.WebJobs.Script.WebHost -Source https://ci.appveyor.com/NuGet/azure-webjobs-sdk-script-g6rygw981l9t -PreRelease }
$WebHostVersion = $result.Split()[1]
Write-host "Adding Microsoft.Azure.WebJobs.Script.WebHost $WebHostVersion to project" -ForegroundColor Green
Invoke-Expression -Command "dotnet add package Microsoft.Azure.WebJobs.Script.WebHost -v $WebHostVersion -s https://ci.appveyor.com/NuGet/azure-webjobs-sdk-script-g6rygw981l9t"
& { dotnet add package Microsoft.Azure.WebJobs.Script.WebHost -v $WebHostVersion -s https://ci.appveyor.com/NuGet/azure-webjobs-sdk-script-g6rygw981l9t }
Set-Location "..\..\build"
}
else {
Expand All @@ -32,18 +32,18 @@ $simulateReleaseBuild = $null
if (-not([bool]::TryParse($env:IsReleaseBuild, [ref] $isReleaseBuild) -and
[bool]::TryParse($env:SimulateReleaseBuild, [ref] $simulateReleaseBuild)))
{
throw "IsReleaseBuild and GenerateSBOM can only be set to true or false."
throw "IsReleaseBuild and SimulateReleaseBuild can only be set to true or false."
}

if ($isReleaseBuild -or $simulateReleaseBuild)
{
$buildCommand = "dotnet run --ci --generateSBOM"
$buildCommand = { dotnet run --ci --generateSBOM }
}
else
{
$buildCommand = "dotnet run --ci"
$buildCommand = { dotnet run --ci }
}

Write-Host "Running $buildCommand"
Invoke-Expression -Command $buildCommand
& $buildCommand
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
4 changes: 2 additions & 2 deletions build/Settings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ private static string config(string @default = null, [CallerMemberName] string k

public static readonly string TelemetryKeyToReplace = "00000000-0000-0000-0000-000000000000";

public static string BuildNumber => config(null, "devops_buildNumber") ?? config("9999", "APPVEYOR_BUILD_NUMBER");
public static string BuildNumber => config("9999", "devops_buildNumber");

public static string CommitId => config(null, "Build.SourceVersion") ?? config("N/A", "APPVEYOR_REPO_COMMIT");
public static string CommitId => config("N/A", "Build.SourceVersion");

public static string TelemetryInstrumentationKey => config(null, "TELEMETRY_INSTRUMENTATION_KEY");

Expand Down