Skip to content
This repository has been archived by the owner on Apr 19, 2022. It is now read-only.

Commit

Permalink
Work on CD/CI [skip ci] (#26)
Browse files Browse the repository at this point in the history
  • Loading branch information
josesimoes authored Oct 26, 2018
1 parent 77ee85f commit 44502b8
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 17 deletions.
3 changes: 0 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ skip_branch_with_pr: true

test: off

pull_requests:
do_not_increment_build_number: true

# Skipping commits affecting specific files
skip_commits:
files:
Expand Down
16 changes: 8 additions & 8 deletions commit-assemblyinfo-changes.ps1
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# skip updating assembly info changes if build is a pull-request or not a tag (master OR release)
if ($env:appveyor_pull_request_number -or
($env:APPVEYOR_REPO_BRANCH -eq "master" -and $env:APPVEYOR_REPO_TAG -eq 'true') -or
($env:APPVEYOR_REPO_BRANCH -match "^release*" -and $env:APPVEYOR_REPO_TAG -eq 'true') -or
$env:APPVEYOR_REPO_TAG -eq "true")
# Copyright (c) 2018 The nanoFramework project contributors
# See LICENSE file in the project root for full license information.

# skip updating assembly info changes if build is a pull-request or not a tag (can't commit when repo is in a tag)
if ($env:appveyor_pull_request_number -or $env:APPVEYOR_REPO_TAG -eq "true")
{
'Skip committing assembly info changes...' | Write-Host -ForegroundColor White
}
Expand All @@ -17,14 +17,14 @@ else
'OK' | Write-Host -ForegroundColor Green
}

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

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

# new branch name
$newBranch = "$env:APPVEYOR_REPO_BRANCH-nfbot/update-version/Windows.Devices.Spi/$env:GitVersion_NuGetVersionV2"
Expand Down
9 changes: 3 additions & 6 deletions generate-change-log.ps1
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
# Copyright (c) 2018 The nanoFramework project contributors
# See LICENSE file in the project root for full license information.

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

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

0 comments on commit 44502b8

Please sign in to comment.