From b630d7c59287ea260186205c853e70af4e41ebfe Mon Sep 17 00:00:00 2001 From: Michael Gordeev Date: Tue, 28 Jan 2020 05:30:49 +0300 Subject: [PATCH 01/12] Configured CI pipeline, added status badge to Readme #4 --- README.md | 1 + azure-pipelines.yml | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 54069a0..c693d05 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # GUTSchedule +[![Build Status](https://dev.azure.com/xfox111/GitHub%20CI/_apis/build/status/XFox111.GUTSchedule?branchName=master)](https://dev.azure.com/xfox111/GitHub%20CI/_build/latest?definitionId=8&branchName=master) ![GitHub release (latest by date)](https://img.shields.io/github/v/release/xfox111/GUTSchedule) ![GitHub issues](https://img.shields.io/github/issues/xfox111/GUTSchedule) [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index da6ac68..c9afcff 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -3,9 +3,6 @@ # Add steps that test, sign, and distribute an app, save build artifacts, and more: # https://docs.microsoft.com/azure/devops/pipelines/languages/xamarin -trigger: -- master - pool: vmImage: 'windows-latest' @@ -19,9 +16,22 @@ steps: - task: NuGetCommand@2 inputs: restoreSolution: '**/*.sln' + +- task: WhiteSource Bolt@20 + inputs: + cwd: '**' - task: XamarinAndroid@1 inputs: projectFile: '**/**.csproj' outputDirectory: '$(outputDirectory)' configuration: '$(buildConfiguration)' + msbuildVersionOption: 'latest' + msbuildArchitectureOption: 'x64' + jdkOption: 'JDKVersion' + +- task: PublishBuildArtifacts@1 + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)' + ArtifactName: 'drop' + publishLocation: 'Container' \ No newline at end of file From 7da590014396ef7dcb3ba8ca0b4c4a05668900fd Mon Sep 17 00:00:00 2001 From: Michael Gordeev Date: Tue, 28 Jan 2020 05:38:09 +0300 Subject: [PATCH 02/12] updated pipeline ci config --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c9afcff..98a4186 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -24,7 +24,7 @@ steps: - task: XamarinAndroid@1 inputs: projectFile: '**/**.csproj' - outputDirectory: '$(outputDirectory)' + outputDirectory: '$(Build.ArtifactStagingDirectory)' configuration: '$(buildConfiguration)' msbuildVersionOption: 'latest' msbuildArchitectureOption: 'x64' From 44d44332faf212e14a8f2cbd319aa61d7fc18a0b Mon Sep 17 00:00:00 2001 From: Michael Gordeev Date: Tue, 28 Jan 2020 06:26:45 +0300 Subject: [PATCH 03/12] Updated CI config #4 --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 98a4186..95f88d3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -24,7 +24,7 @@ steps: - task: XamarinAndroid@1 inputs: projectFile: '**/**.csproj' - outputDirectory: '$(Build.ArtifactStagingDirectory)' + outputDirectory: '$(outputDirectory)' configuration: '$(buildConfiguration)' msbuildVersionOption: 'latest' msbuildArchitectureOption: 'x64' @@ -32,6 +32,6 @@ steps: - task: PublishBuildArtifacts@1 inputs: - PathtoPublish: '$(Build.ArtifactStagingDirectory)' + PathtoPublish: '**/**.apk' ArtifactName: 'drop' publishLocation: 'Container' \ No newline at end of file From a75d69178afaf617d920ea8efce6a38410a76d90 Mon Sep 17 00:00:00 2001 From: Michael Gordeev Date: Tue, 28 Jan 2020 06:30:26 +0300 Subject: [PATCH 04/12] Updated CI config #4 --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 95f88d3..7b8e3ff 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -32,6 +32,6 @@ steps: - task: PublishBuildArtifacts@1 inputs: - PathtoPublish: '**/**.apk' + PathtoPublish: '$(outputDirectory)/**.apk' ArtifactName: 'drop' publishLocation: 'Container' \ No newline at end of file From a13c3675c4892e84b06ffc0e952ce113d5b717ab Mon Sep 17 00:00:00 2001 From: Michael Gordeev Date: Tue, 28 Jan 2020 06:37:46 +0300 Subject: [PATCH 05/12] Updated CI config #4 --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7b8e3ff..db374e0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -32,6 +32,6 @@ steps: - task: PublishBuildArtifacts@1 inputs: - PathtoPublish: '$(outputDirectory)/**.apk' + PathtoPublish: '$(outputDirectory)' ArtifactName: 'drop' publishLocation: 'Container' \ No newline at end of file From 9d301522e46432b272e940e6abe880a1474d3faf Mon Sep 17 00:00:00 2001 From: Michael Gordeev Date: Tue, 28 Jan 2020 13:50:49 +0300 Subject: [PATCH 06/12] Update azure-pipelines.yml for Azure Pipelines #4 --- azure-pipelines.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index db374e0..45dfbdc 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -30,8 +30,15 @@ steps: msbuildArchitectureOption: 'x64' jdkOption: 'JDKVersion' +- task: DeleteFiles@1 + inputs: + SourceFolder: '$(outputDirectory)' + Contents: | + **/**.pdb + **/**.dll + - task: PublishBuildArtifacts@1 inputs: PathtoPublish: '$(outputDirectory)' - ArtifactName: 'drop' + ArtifactName: 'bundle' publishLocation: 'Container' \ No newline at end of file From 56ab18b90d019aa95186d13a062f2ed6ad95e3da Mon Sep 17 00:00:00 2001 From: Michael Gordeev Date: Tue, 28 Jan 2020 14:20:36 +0300 Subject: [PATCH 07/12] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 45dfbdc..b2fc986 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -37,6 +37,14 @@ steps: **/**.pdb **/**.dll +- task: ArchiveFiles@2 + inputs: + rootFolderOrFile: '$(Build.Repository.LocalPath)' + includeRootFolder: true + archiveType: 'zip' + archiveFile: '$(outputDirectory)/Source-$(Build.SourceVersion).zip' + replaceExistingArchive: true + - task: PublishBuildArtifacts@1 inputs: PathtoPublish: '$(outputDirectory)' From 9fc9aa1b4554dea1dfeabff515d09626355f88c0 Mon Sep 17 00:00:00 2001 From: Michael Gordeev Date: Tue, 28 Jan 2020 14:35:06 +0300 Subject: [PATCH 08/12] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b2fc986..e2e6db9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -40,7 +40,7 @@ steps: - task: ArchiveFiles@2 inputs: rootFolderOrFile: '$(Build.Repository.LocalPath)' - includeRootFolder: true + includeRootFolder: false archiveType: 'zip' archiveFile: '$(outputDirectory)/Source-$(Build.SourceVersion).zip' replaceExistingArchive: true From 80beafc2a5dfdf67069a2729bad8fba6a4479915 Mon Sep 17 00:00:00 2001 From: Michael Gordeev Date: Tue, 28 Jan 2020 19:05:16 +0300 Subject: [PATCH 09/12] Added changelog file, updated pipeline config --- azure-pipelines.yml | 14 ++++++-------- changelog.md | 5 +++++ 2 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 changelog.md diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e2e6db9..344a2d8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -21,6 +21,12 @@ steps: inputs: cwd: '**' +- task: ResharperCli@2 + inputs: + solutionOrProjectPath: '**/*.sln' + failBuildLevelSelector: 'Error' + failBuildOnCodeIssues: false + - task: XamarinAndroid@1 inputs: projectFile: '**/**.csproj' @@ -37,14 +43,6 @@ steps: **/**.pdb **/**.dll -- task: ArchiveFiles@2 - inputs: - rootFolderOrFile: '$(Build.Repository.LocalPath)' - includeRootFolder: false - archiveType: 'zip' - archiveFile: '$(outputDirectory)/Source-$(Build.SourceVersion).zip' - replaceExistingArchive: true - - task: PublishBuildArtifacts@1 inputs: PathtoPublish: '$(outputDirectory)' diff --git a/changelog.md b/changelog.md new file mode 100644 index 0000000..62b53af --- /dev/null +++ b/changelog.md @@ -0,0 +1,5 @@ +# Chabgelog file +## Changelog filling guidelines +- Update before every merge to master. +- Fill in English +- Should be compatible with Google Play changelog format (no Markdown) \ No newline at end of file From eaed51f6a3a5ff3c87327bdc18eb8797e141940a Mon Sep 17 00:00:00 2001 From: Michael Gordeev Date: Tue, 28 Jan 2020 19:17:49 +0300 Subject: [PATCH 10/12] Updated pipeline config --- azure-pipelines.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 344a2d8..d892aa7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -16,14 +16,10 @@ steps: - task: NuGetCommand@2 inputs: restoreSolution: '**/*.sln' - -- task: WhiteSource Bolt@20 - inputs: - cwd: '**' - task: ResharperCli@2 inputs: - solutionOrProjectPath: '**/*.sln' + solutionOrProjectPath: 'GUT.Schedule/GUT.Schedule.sln' failBuildLevelSelector: 'Error' failBuildOnCodeIssues: false @@ -43,6 +39,12 @@ steps: **/**.pdb **/**.dll +- task: CopyFiles@2 + inputs: + SourceFolder: '$(Build.SourcesDirectory)' + Contents: 'changelog.md' + TargetFolder: '$(outputDirectory)' + - task: PublishBuildArtifacts@1 inputs: PathtoPublish: '$(outputDirectory)' From 254d85491803c8a5a4b8258d3dc85bf5bfca979e Mon Sep 17 00:00:00 2001 From: Michael Gordeev Date: Tue, 28 Jan 2020 22:34:42 +0300 Subject: [PATCH 11/12] Added CD pipeline badge --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index c693d05..57fcfbb 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # GUTSchedule [![Build Status](https://dev.azure.com/xfox111/GitHub%20CI/_apis/build/status/XFox111.GUTSchedule?branchName=master)](https://dev.azure.com/xfox111/GitHub%20CI/_build/latest?definitionId=8&branchName=master) +![Continious Delivery Pipeline](https://vsrm.dev.azure.com/xfox111/_apis/public/Release/badge/e42c572c-a3cd-4aac-bbb1-f720d9ccb5ea/1/5) + ![GitHub release (latest by date)](https://img.shields.io/github/v/release/xfox111/GUTSchedule) ![GitHub issues](https://img.shields.io/github/issues/xfox111/GUTSchedule) [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) From 5d3af94f38943a5d73e2deb83972281e2bf9b5f5 Mon Sep 17 00:00:00 2001 From: Michael Gordeev Date: Tue, 28 Jan 2020 22:36:11 +0300 Subject: [PATCH 12/12] Fixed typo in changelog.md --- changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index 62b53af..9460f59 100644 --- a/changelog.md +++ b/changelog.md @@ -1,4 +1,4 @@ -# Chabgelog file +# Changelog file ## Changelog filling guidelines - Update before every merge to master. - Fill in English