Skip to content

Commit 9e67c9f

Browse files
authored
Work on CD/CI [skip ci] (#1)
1 parent 4fdeba2 commit 9e67c9f

2 files changed

Lines changed: 5 additions & 11 deletions

File tree

commit-assemblyinfo-changes.ps1

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
# Copyright (c) 2018 The nanoFramework project contributors
22
# See LICENSE file in the project root for full license information.
33

4-
# skip updating assembly info changes if build is a pull-request or not a tag (master OR release)
5-
if ($env:appveyor_pull_request_number -or
6-
($env:APPVEYOR_REPO_BRANCH -eq "master" -and $env:APPVEYOR_REPO_TAG -eq 'true') -or
7-
($env:APPVEYOR_REPO_BRANCH -match "^release*" -and $env:APPVEYOR_REPO_TAG -eq 'true') -or
8-
$env:APPVEYOR_REPO_TAG -eq "true")
4+
# skip updating assembly info changes if build is a pull-request or not a tag (can't commit when repo is in a tag)
5+
if ($env:appveyor_pull_request_number -or $env:APPVEYOR_REPO_TAG -eq "true")
96
{
107
'Skip committing assembly info changes...' | Write-Host -ForegroundColor White
118
}

generate-change-log.ps1

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
# Copyright (c) 2018 The nanoFramework project contributors
22
# See LICENSE file in the project root for full license information.
33

4-
# generate change log when build is NOT a pull-request or not a tag (master OR release)
5-
if ($env:appveyor_pull_request_number -or
6-
($env:APPVEYOR_REPO_BRANCH -eq "master" -and $env:APPVEYOR_REPO_TAG -eq 'true') -or
7-
($env:APPVEYOR_REPO_BRANCH -match "^release*" -and $env:APPVEYOR_REPO_TAG -eq 'true') -or
8-
$env:APPVEYOR_REPO_TAG -eq "true")
4+
# skip generating the change log when build is a pull-request or not a tag (can't commit when repo is in a tag)
5+
if ($env:appveyor_pull_request_number -or $env:APPVEYOR_REPO_TAG -eq "true")
96
{
107
'Skip change log processing...' | Write-Host -ForegroundColor White
118
}
129
else
1310
{
1411
# need this to keep ruby happy
15-
md c:\tmp
12+
md c:\tmp > $null
1613

1714
if ($env:APPVEYOR_REPO_BRANCH -eq "master" -or $env:APPVEYOR_REPO_BRANCH -match "^release*")
1815
{

0 commit comments

Comments
 (0)