Skip to content

Commit 54c1286

Browse files
committed
Work CI-CD
- Remove preview from update dependents PS1. - Brought pipeline yaml up to speed. ***NO_CI***
1 parent dea35ac commit 54c1286

File tree

2 files changed

+11
-19
lines changed

2 files changed

+11
-19
lines changed

azure-pipelines.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ trigger:
2020
- config/*
2121
- .github/*
2222

23-
tags:
24-
include:
25-
- v*
26-
2723
# PR always trigger build
2824
pr:
2925
autoCancel: true
@@ -176,7 +172,7 @@ jobs:
176172

177173
# update could build number (only possible if this is not a PR from a fork)
178174
- task: PowerShell@2
179-
condition: and( succeeded(), ne(variables['system.pullrequest.isfork'], true) )
175+
condition: succeeded()
180176
displayName: Update cloud build number
181177
inputs:
182178
targetType: 'inline'
@@ -255,16 +251,16 @@ jobs:
255251
packagesToPush: '$(Build.ArtifactStagingDirectory)/*.nupkg'
256252
publishFeedCredentials: 'NuGet-$(System.TeamProject)'
257253

258-
# create or update GitHub release ON tags from release or main branches
254+
# create or update GitHub release
259255
- task: GithubRelease@1
260256
condition: >-
261257
and(
262258
succeeded(),
263259
eq(variables['System.PullRequest.PullRequestId'], ''),
264-
not(startsWith(variables['Build.SourceBranch'], 'refs/tags/v')),
265-
eq(variables['StartReleaseCandidate'], false)
260+
startsWith(variables['Build.SourceBranch'], 'refs/heads/develop'),
261+
eq(variables['UPDATE_DEPENDENTS'], 'false')
266262
)
267-
displayName: Create/Update GitHub stable release
263+
displayName: Create/Update GitHub release
268264
inputs:
269265
action: edit
270266
gitHubConnection: 'github.com_nano-$(System.TeamProject)'
@@ -286,7 +282,7 @@ jobs:
286282
eq(dependencies.Get_Build_Flags.outputs['GetPRLabels.RUN_UPDATE_DEPENDENTS'], 'true'),
287283
eq(variables['UPDATE_DEPENDENTS'], 'true')
288284
),
289-
not(startsWith(variables['Build.SourceBranch'], 'refs/tags/v'))
285+
eq(variables['System.PullRequest.PullRequestId'], ''),
290286
)
291287
292288
dependsOn:

azure-pipelines/update-dependents.ps1

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ function UpdateTestFrameworkVersion {
1919
# 'encoded token' is the Base64 of the string "nfbot:personal-token"
2020
$auth = "basic $([System.Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes("nfbot:$env:MY_GITHUB_TOKEN"))))"
2121

22-
# because it can take sometime for the package to become available on the NuGet providers
23-
# need to hang here for 1 minute (1 * 60)
24-
"Waiting 1 minute to let package process flow in Azure Artifacts feed..." | Write-Host
25-
Start-Sleep -Seconds 60
26-
2722
# init/reset these
2823
$commitMessage = ""
2924
$prTitle = ""
@@ -41,7 +36,7 @@ git clone --depth 1 https://github.com/nanoframework/nf-Visual-Studio-extension
4136
Set-Location repo | Out-Null
4237
git config --global gc.auto 0
4338
git config --global user.name nfbot
44-
git config --global user.email dependencybot@nanoframework.net
39+
git config --global user.email nanoframework@outlook.com
4540
git config --global core.autocrlf true
4641

4742
Write-Host "Checkout develop branch..."
@@ -52,12 +47,13 @@ dotnet nuget add source https://pkgs.dev.azure.com/nanoframework/feed/_packaging
5247
####################
5348
# VS 2019 & 2022
5449

55-
Write-Host "Updating nanoFramework.TestFramework package in VS2019 & VS2022 solution..."
50+
"*****************************************************************************************************" | Write-Host
51+
"Updating nanoFramework.Tools.MetadataProcessor.MsBuildTask.Net package in VS2019 & VS2022 solution..." | Write-Host
5652

5753
dotnet remove VisualStudio.Extension-2019/VisualStudio.Extension-vs2019.csproj package nanoFramework.TestFramework
58-
dotnet add VisualStudio.Extension-2019/VisualStudio.Extension-vs2019.csproj package nanoFramework.TestFramework --prerelease
54+
dotnet add VisualStudio.Extension-2019/VisualStudio.Extension-vs2019.csproj package nanoFramework.TestFramework
5955
dotnet remove VisualStudio.Extension-2022/VisualStudio.Extension-vs2022.csproj package nanoFramework.TestFramework
60-
dotnet add VisualStudio.Extension-2022/VisualStudio.Extension-vs2022.csproj package nanoFramework.TestFramework --prerelease
56+
dotnet add VisualStudio.Extension-2022/VisualStudio.Extension-vs2022.csproj package nanoFramework.TestFramework
6157

6258
#####################
6359

0 commit comments

Comments
 (0)