Skip to content

Commit d10b5ef

Browse files
authored
Work on CD/CI [skip ci] (#29)
1 parent da12577 commit d10b5ef

File tree

3 files changed

+8
-17
lines changed

3 files changed

+8
-17
lines changed

appveyor.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ skip_branch_with_pr: true
88

99
test: off
1010

11-
pull_requests:
12-
do_not_increment_build_number: true
13-
1411
# Skipping commits affecting specific files
1512
skip_commits:
1613
files:

commit-assemblyinfo-changes.ps1

Lines changed: 5 additions & 8 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
}
@@ -20,14 +17,14 @@ else
2017
'OK' | Write-Host -ForegroundColor Green
2118
}
2219

23-
# update assembly info in nf-interpreter if we are in development branch or if this is tag (master OR release)
24-
if ($env:APPVEYOR_REPO_BRANCH -match "^dev*" -or $env:APPVEYOR_REPO_TAG -eq "true")
20+
# update assembly info in nf-interpreter if this is tag
21+
if ($env:APPVEYOR_REPO_TAG -eq "true")
2522
{
2623
'Updating assembly version in nf-interpreter...' | Write-Host -ForegroundColor White -NoNewline
2724

2825
# clone nf-interpreter repo (only a shallow clone with last commit)
2926
git clone https://github.com/nanoframework/nf-interpreter -b develop --depth 1 -q
30-
cd nf-interpreter
27+
cd nf-interpreter > $null
3128

3229
# new branch name
3330
$newBranch = "$env:APPVEYOR_REPO_BRANCH-nfbot/update-version/nanoFramework.Hardware.Esp32/$env:GitVersion_NuGetVersionV2"

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)