Skip to content

Commit 7722521

Browse files
authored
Merge branch 'master' into release-v1.5.0
2 parents ac4a245 + 17a300d commit 7722521

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Changelog
22

3-
## [**Changes available only in 'Preview' images:**](https://github.com/nanoframework/nf-interpreter/tree/HEAD)
3+
## [v1.4.2.1](https://github.com/nanoframework/nf-interpreter/tree/v1.4.2.1) (2020-06-08)
44

5-
[Full Changelog](https://github.com/nanoframework/nf-interpreter/compare/v1.3.2...HEAD)
5+
[Full Changelog](https://github.com/nanoframework/nf-interpreter/compare/v1.3.2...v1.4.2.1)
66

77
**Implemented enhancements:**
88

azure-pipelines-templates/pack-publish-artifacts.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,3 @@ steps:
1717
flattenFolders: true
1818
condition: and( succeeded(), ne(variables['Build.Reason'], 'PullRequest') )
1919
displayName: Collecting deployable artifacts
20-

azure-pipelines-templates/publish-bintray.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ steps:
4444
sourceFolder: $(Agent.TempDirectory)
4545
Contents: |
4646
*.zip
47+
'$(BoardName)-$(NBGV_AssemblyVersion)-preview.zip'
4748
TargetFolder: '$(Build.ArtifactStagingDirectory)\$(BoardName)'
4849
flattenFolders: true
4950
condition: or( eq(variables['ForceUpload'], true), and( succeeded(), ne(variables['Build.Reason'], 'PullRequest'), or( contains(variables['Build.SourceBranchName'], 'develop'), contains(variables['Build.SourceBranchName'], 'release') ) ) )

version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@
2121
"branchName": "release-v{version}",
2222
"firstUnstableTag": "preview"
2323
}
24-
}
24+
}

0 commit comments

Comments
 (0)