From 54b60d0c51485425b9b07bb710bd8b32a639fdad Mon Sep 17 00:00:00 2001 From: Jacob Motley Date: Tue, 28 Jan 2020 16:36:21 -0500 Subject: [PATCH 01/26] Set up CI with Azure Pipelines [skip ci] --- azure-pipelines.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 azure-pipelines.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 0000000..aa91291 --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,19 @@ +# Starter pipeline +# Start with a minimal pipeline that you can customize to build and deploy your code. +# Add steps that build, run tests, deploy, and more: +# https://aka.ms/yaml + +trigger: +- master + +pool: + vmImage: 'ubuntu-latest' + +steps: +- script: echo Hello, world! + displayName: 'Run a one-line script' + +- script: | + echo Add other tasks to build, test, and deploy your project. + echo See https://aka.ms/yaml + displayName: 'Run a multi-line script' From e02b1a3f11c58375a7e72421046f09460ac882f7 Mon Sep 17 00:00:00 2001 From: Jacob Motley Date: Wed, 26 Feb 2020 20:25:14 -0500 Subject: [PATCH 02/26] added jobs for windows and osx --- azure-pipelines.yml | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index aa91291..9e73954 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,19 +1,22 @@ -# Starter pipeline -# Start with a minimal pipeline that you can customize to build and deploy your code. -# Add steps that build, run tests, deploy, and more: -# https://aka.ms/yaml - trigger: - master +- azure-pipelines -pool: - vmImage: 'ubuntu-latest' - -steps: -- script: echo Hello, world! - displayName: 'Run a one-line script' - -- script: | - echo Add other tasks to build, test, and deploy your project. - echo See https://aka.ms/yaml - displayName: 'Run a multi-line script' +stages: + - stage: + jobs: + - job: 'Build PyInstaller - Windows' + pool: + vmImage: 'windows-latest' + steps: + - task: UsePythonVersion@0 + inputs: + versionSpec: '3.7' + + - job: 'Build PyInstaller - Mac OSX' + pool: + vmImage: 'macOS-latest' + steps: + - task: UsePythonVersion@0 + inputs: + versionSpec: '3.7' From 84bccc498d02285b2a99d4eb40d2f0a79256ca84 Mon Sep 17 00:00:00 2001 From: Jacob Motley Date: Wed, 26 Feb 2020 20:28:28 -0500 Subject: [PATCH 03/26] fix job description syntax --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9e73954..13e9123 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -5,7 +5,7 @@ trigger: stages: - stage: jobs: - - job: 'Build PyInstaller - Windows' + - job: 'Build_PyInstaller_Windows' pool: vmImage: 'windows-latest' steps: @@ -13,7 +13,7 @@ stages: inputs: versionSpec: '3.7' - - job: 'Build PyInstaller - Mac OSX' + - job: 'Build_PyInstaller_Mac_OSX' pool: vmImage: 'macOS-latest' steps: From 07e4a94b7c113352e6bee39f2f08300df4f86d2f Mon Sep 17 00:00:00 2001 From: Jacob Motley Date: Wed, 26 Feb 2020 20:36:35 -0500 Subject: [PATCH 04/26] add update pip, install wheel and pyinstaller --- azure-pipelines.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 13e9123..d47e798 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -12,7 +12,13 @@ stages: - task: UsePythonVersion@0 inputs: versionSpec: '3.7' - + - script: python -m pip install --upgrade pip + displayName: 'update pip' + - script: python -m pip install wheel + displayName: 'install wheel' + - script: python -m pip install pyinstaller + displayName: 'install pyinstaller' + - job: 'Build_PyInstaller_Mac_OSX' pool: vmImage: 'macOS-latest' @@ -20,3 +26,9 @@ stages: - task: UsePythonVersion@0 inputs: versionSpec: '3.7' + - script: python -m pip install --upgrade pip + displayName: 'update pip' + - script: python -m pip install wheel + displayName: 'update wheel' + - script: python -m pip install pyinstaller + displayName: 'install pyinstaller' From d0f612ade004a81a0ec357db2e1f2f9f7c936443 Mon Sep 17 00:00:00 2001 From: Jacob Motley Date: Wed, 26 Feb 2020 21:08:48 -0500 Subject: [PATCH 05/26] added pip requirements install --- azure-pipelines.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d47e798..e9aa9b4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -18,6 +18,8 @@ stages: displayName: 'install wheel' - script: python -m pip install pyinstaller displayName: 'install pyinstaller' + - script: python -m pip install -r ./requirements.txt + displayName: 'install HerbASAP requirements' - job: 'Build_PyInstaller_Mac_OSX' pool: @@ -32,3 +34,5 @@ stages: displayName: 'update wheel' - script: python -m pip install pyinstaller displayName: 'install pyinstaller' + - script: python -m pip install -r ./requirements.txt + displayName: 'install HerbASAP requirements' From c741b7cd926a1a5aeb567badd94ec7ac53568e61 Mon Sep 17 00:00:00 2001 From: Jacob Motley Date: Wed, 26 Feb 2020 21:21:23 -0500 Subject: [PATCH 06/26] added pyinstaller step --- azure-pipelines.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e9aa9b4..f02ee12 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,6 +20,8 @@ stages: displayName: 'install pyinstaller' - script: python -m pip install -r ./requirements.txt displayName: 'install HerbASAP requirements' + - script: pyinstaller ./docs/build_docs/win_build.spec + displayName: 'build HerbASAP pyinstaller' - job: 'Build_PyInstaller_Mac_OSX' pool: @@ -36,3 +38,5 @@ stages: displayName: 'install pyinstaller' - script: python -m pip install -r ./requirements.txt displayName: 'install HerbASAP requirements' + - script: pyinstaller ./docs/build_docs/macos_build.spec + displayName: 'build HerbASAP pyinstaller' From 06907ddbb2520443efb7d8711d33e9bcfedea6f3 Mon Sep 17 00:00:00 2001 From: Jacob Motley Date: Wed, 26 Feb 2020 21:26:06 -0500 Subject: [PATCH 07/26] mispelled file name --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f02ee12..cf1d9b8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,7 +20,7 @@ stages: displayName: 'install pyinstaller' - script: python -m pip install -r ./requirements.txt displayName: 'install HerbASAP requirements' - - script: pyinstaller ./docs/build_docs/win_build.spec + - script: pyinstaller ./docs/build_docs/win-build.spec displayName: 'build HerbASAP pyinstaller' - job: 'Build_PyInstaller_Mac_OSX' @@ -38,5 +38,5 @@ stages: displayName: 'install pyinstaller' - script: python -m pip install -r ./requirements.txt displayName: 'install HerbASAP requirements' - - script: pyinstaller ./docs/build_docs/macos_build.spec + - script: pyinstaller ./docs/build_docs/macos-build.spec displayName: 'build HerbASAP pyinstaller' From d31de9d500e3aaa469ad2cf650d96101699b01f4 Mon Sep 17 00:00:00 2001 From: Jacob Motley Date: Sun, 1 Mar 2020 13:22:46 -0500 Subject: [PATCH 08/26] copy spec file to root so commands in spec file have correct file path root --- azure-pipelines.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index cf1d9b8..edbdc3d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,6 +20,8 @@ stages: displayName: 'install pyinstaller' - script: python -m pip install -r ./requirements.txt displayName: 'install HerbASAP requirements' + - script: copy ./docs/build_docs/win-build.spec ./win-build.spec + displayName: 'copy spec file to dir root' - script: pyinstaller ./docs/build_docs/win-build.spec displayName: 'build HerbASAP pyinstaller' @@ -38,5 +40,7 @@ stages: displayName: 'install pyinstaller' - script: python -m pip install -r ./requirements.txt displayName: 'install HerbASAP requirements' - - script: pyinstaller ./docs/build_docs/macos-build.spec + - script: cp ./docs/build_docs/macos-build.spec ./macos-build.spec + displayName: 'copy spec file to dir root' + - script: pyinstaller ./macos-build.spec displayName: 'build HerbASAP pyinstaller' From 2a7b668ceb5d4e8a55208ed8c3579d7e712a2557 Mon Sep 17 00:00:00 2001 From: Jacob Motley Date: Sun, 1 Mar 2020 13:35:48 -0500 Subject: [PATCH 09/26] windows directories \ not / --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index edbdc3d..8eb1761 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,7 +20,7 @@ stages: displayName: 'install pyinstaller' - script: python -m pip install -r ./requirements.txt displayName: 'install HerbASAP requirements' - - script: copy ./docs/build_docs/win-build.spec ./win-build.spec + - script: copy .\docs\build_docs\win-build.spec .\win-build.spec displayName: 'copy spec file to dir root' - script: pyinstaller ./docs/build_docs/win-build.spec displayName: 'build HerbASAP pyinstaller' From a1f45cf58e86484cd62d1836a22a864a76d9fd01 Mon Sep 17 00:00:00 2001 From: Jacob Motley Date: Sun, 1 Mar 2020 13:42:55 -0500 Subject: [PATCH 10/26] run command on copied file --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8eb1761..841fada 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -22,7 +22,7 @@ stages: displayName: 'install HerbASAP requirements' - script: copy .\docs\build_docs\win-build.spec .\win-build.spec displayName: 'copy spec file to dir root' - - script: pyinstaller ./docs/build_docs/win-build.spec + - script: pyinstaller ./win-build.spec displayName: 'build HerbASAP pyinstaller' - job: 'Build_PyInstaller_Mac_OSX' From dbfcd18d59c1393bfe6ab4cb4b48f06fd37c2716 Mon Sep 17 00:00:00 2001 From: Jacob Motley Date: Mon, 2 Mar 2020 21:43:29 -0500 Subject: [PATCH 11/26] add build artifact publishing --- azure-pipelines.yml | 12 +++++++++++- docs/build_docs/macos-build.spec | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 841fada..2f2ae2f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -24,8 +24,13 @@ stages: displayName: 'copy spec file to dir root' - script: pyinstaller ./win-build.spec displayName: 'build HerbASAP pyinstaller' + - task: PublishPipelineArtifact@1 + displayName: 'publish windows build output' + inputs: + path: '**/*.exe' + artifact: win-build - - job: 'Build_PyInstaller_Mac_OSX' + - job: 'Build_PyInstaller_MacOS' pool: vmImage: 'macOS-latest' steps: @@ -44,3 +49,8 @@ stages: displayName: 'copy spec file to dir root' - script: pyinstaller ./macos-build.spec displayName: 'build HerbASAP pyinstaller' + - task: PublishPipelineArtifact@1 + displayName: 'publish macos build output' + inputs: + path: '**/*.app' + artifact: macos-build diff --git a/docs/build_docs/macos-build.spec b/docs/build_docs/macos-build.spec index 9bef926..abff5e9 100644 --- a/docs/build_docs/macos-build.spec +++ b/docs/build_docs/macos-build.spec @@ -4,7 +4,7 @@ block_cipher = None a = Analysis(['postProcessing.py'], - pathex=['/Users/dakila/Documents/Git/HerbASAP/'], + pathex=[], # have to show it how to find the custom pyzbar dlls binaries=[], # for Qt binary misplacement issue see below From 9846cafb1f3fc01935e3ad86d69fd8a85a9f5655 Mon Sep 17 00:00:00 2001 From: Jacob Motley Date: Mon, 2 Mar 2020 22:13:16 -0500 Subject: [PATCH 12/26] change directory for build output, also echo default working directory for later --- azure-pipelines.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2f2ae2f..832b1d1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -24,10 +24,12 @@ stages: displayName: 'copy spec file to dir root' - script: pyinstaller ./win-build.spec displayName: 'build HerbASAP pyinstaller' + - script: Write-Host $(System.DefaultWorkingDirectory) + displayName: 'echo default working directory' - task: PublishPipelineArtifact@1 displayName: 'publish windows build output' inputs: - path: '**/*.exe' + path: $(System.DefaultWorkingDirectory)/dist/*.exe artifact: win-build - job: 'Build_PyInstaller_MacOS' @@ -49,8 +51,10 @@ stages: displayName: 'copy spec file to dir root' - script: pyinstaller ./macos-build.spec displayName: 'build HerbASAP pyinstaller' + - script: echo $(System.DefaultWorkingDirectory) + displayName: 'echo default working directory' - task: PublishPipelineArtifact@1 displayName: 'publish macos build output' inputs: - path: '**/*.app' + path: $(System.DefaultWorkingDirectory)/dist/*.app artifact: macos-build From 235167a8e791684d4aa57d683fae4fdab4e889a1 Mon Sep 17 00:00:00 2001 From: Jacob Motley Date: Mon, 2 Mar 2020 22:22:30 -0500 Subject: [PATCH 13/26] cucked by cmd --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 832b1d1..5e58558 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -24,7 +24,7 @@ stages: displayName: 'copy spec file to dir root' - script: pyinstaller ./win-build.spec displayName: 'build HerbASAP pyinstaller' - - script: Write-Host $(System.DefaultWorkingDirectory) + - script: echo $(System.DefaultWorkingDirectory) displayName: 'echo default working directory' - task: PublishPipelineArtifact@1 displayName: 'publish windows build output' From 151f32ca2b5b4ca0ffebd003011b7d3dfecd84ea Mon Sep 17 00:00:00 2001 From: Jacob Motley Date: Tue, 3 Mar 2020 18:56:15 -0500 Subject: [PATCH 14/26] added temporary tasks to get idea of build vm directory structure after build --- azure-pipelines.yml | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5e58558..2acf0ab 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -26,11 +26,13 @@ stages: displayName: 'build HerbASAP pyinstaller' - script: echo $(System.DefaultWorkingDirectory) displayName: 'echo default working directory' - - task: PublishPipelineArtifact@1 - displayName: 'publish windows build output' - inputs: - path: $(System.DefaultWorkingDirectory)/dist/*.exe - artifact: win-build + - script: dir $(System.DefaultWorkingDirectory) + displayName: 'list default working directory contents' + # - task: PublishPipelineArtifact@1 + # displayName: 'publish windows build output' + # inputs: + # path: $(System.DefaultWorkingDirectory)/dist/*.exe + # artifact: win-build - job: 'Build_PyInstaller_MacOS' pool: @@ -53,8 +55,10 @@ stages: displayName: 'build HerbASAP pyinstaller' - script: echo $(System.DefaultWorkingDirectory) displayName: 'echo default working directory' - - task: PublishPipelineArtifact@1 - displayName: 'publish macos build output' - inputs: - path: $(System.DefaultWorkingDirectory)/dist/*.app - artifact: macos-build + - script: ls $(System.DefaultWorkingDirectory) + displayName: 'list default working directory contents' + # - task: PublishPipelineArtifact@1 + # displayName: 'publish macos build output' + # inputs: + # path: $(System.DefaultWorkingDirectory)/dist/*.app + # artifact: macos-build From 4a580350cc05a5c4b2aa848c4533b1de5ce16769 Mon Sep 17 00:00:00 2001 From: Jacob Motley Date: Tue, 3 Mar 2020 19:04:18 -0500 Subject: [PATCH 15/26] show contents of dist directory --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2acf0ab..b6715a1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -26,7 +26,7 @@ stages: displayName: 'build HerbASAP pyinstaller' - script: echo $(System.DefaultWorkingDirectory) displayName: 'echo default working directory' - - script: dir $(System.DefaultWorkingDirectory) + - script: dir $(System.DefaultWorkingDirectory)\dist displayName: 'list default working directory contents' # - task: PublishPipelineArtifact@1 # displayName: 'publish windows build output' @@ -55,7 +55,7 @@ stages: displayName: 'build HerbASAP pyinstaller' - script: echo $(System.DefaultWorkingDirectory) displayName: 'echo default working directory' - - script: ls $(System.DefaultWorkingDirectory) + - script: ls $(System.DefaultWorkingDirectory)/dist displayName: 'list default working directory contents' # - task: PublishPipelineArtifact@1 # displayName: 'publish macos build output' From 0447ef751c78f380fdde5d15cc2e34292d93a930 Mon Sep 17 00:00:00 2001 From: Jacob Motley Date: Tue, 3 Mar 2020 21:45:11 -0500 Subject: [PATCH 16/26] let's give it the good ole college try --- azure-pipelines.yml | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b6715a1..bd1f9a3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -24,15 +24,11 @@ stages: displayName: 'copy spec file to dir root' - script: pyinstaller ./win-build.spec displayName: 'build HerbASAP pyinstaller' - - script: echo $(System.DefaultWorkingDirectory) - displayName: 'echo default working directory' - - script: dir $(System.DefaultWorkingDirectory)\dist - displayName: 'list default working directory contents' - # - task: PublishPipelineArtifact@1 - # displayName: 'publish windows build output' - # inputs: - # path: $(System.DefaultWorkingDirectory)/dist/*.exe - # artifact: win-build + - task: PublishPipelineArtifact@1 + displayName: 'publish windows build output' + inputs: + path: $(System.DefaultWorkingDirectory)/dist/HerbASAP.exe + artifact: win-build - job: 'Build_PyInstaller_MacOS' pool: @@ -53,12 +49,8 @@ stages: displayName: 'copy spec file to dir root' - script: pyinstaller ./macos-build.spec displayName: 'build HerbASAP pyinstaller' - - script: echo $(System.DefaultWorkingDirectory) - displayName: 'echo default working directory' - - script: ls $(System.DefaultWorkingDirectory)/dist - displayName: 'list default working directory contents' - # - task: PublishPipelineArtifact@1 - # displayName: 'publish macos build output' - # inputs: - # path: $(System.DefaultWorkingDirectory)/dist/*.app - # artifact: macos-build + - task: PublishPipelineArtifact@1 + displayName: 'publish macos build output' + inputs: + path: $(System.DefaultWorkingDirectory)/dist/HerbASAP.app + artifact: macos-build From 8d9d9eb0093b6f5f089f4f01803ddb3167ea4091 Mon Sep 17 00:00:00 2001 From: Jacob Motley Date: Tue, 3 Mar 2020 22:03:45 -0500 Subject: [PATCH 17/26] start building github release job by downloading artifacts --- azure-pipelines.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index bd1f9a3..729e83a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -54,3 +54,19 @@ stages: inputs: path: $(System.DefaultWorkingDirectory)/dist/HerbASAP.app artifact: macos-build + + - job: 'Github_Release' + pool: + vmImage: 'windows-latest' + steps: + - task: DownloadPipelineArtifact@2 + displayName: 'download HerbASAP windows build' + inputs: + artifact: win-build + - task: DownloadPipelineArtifact@2 + displayName: 'download HerbASAP macos build' + inputs: + artifact: macos-build + - script: dir $(Pipeline.Workspace) + displayName: 'show pipeline workspace directory contents' + \ No newline at end of file From 6801374f43391fe102cbd065f3bcaae6d10690a2 Mon Sep 17 00:00:00 2001 From: Jacob Motley Date: Tue, 3 Mar 2020 22:10:59 -0500 Subject: [PATCH 18/26] add stages --- azure-pipelines.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 729e83a..1f3832e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -3,7 +3,7 @@ trigger: - azure-pipelines stages: - - stage: + - stage: Build jobs: - job: 'Build_PyInstaller_Windows' pool: @@ -55,6 +55,8 @@ stages: path: $(System.DefaultWorkingDirectory)/dist/HerbASAP.app artifact: macos-build + - stage: Release + jobs: - job: 'Github_Release' pool: vmImage: 'windows-latest' From 30420f86aeccd7d8dbe5c63e5c1f0203b6192bd4 Mon Sep 17 00:00:00 2001 From: Jacob Motley Date: Tue, 12 May 2020 13:31:12 -0400 Subject: [PATCH 19/26] zip the mac os ".app" build output before releasing (other os just sees it as a directory) --- azure-pipelines.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1f3832e..4a4015c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -49,10 +49,17 @@ stages: displayName: 'copy spec file to dir root' - script: pyinstaller ./macos-build.spec displayName: 'build HerbASAP pyinstaller' + - task: ArchiveFiles@2 + inputs: + rootFolderOrFile: '$(System.DefaultWorkingDirectory)/dist/HerbASAP.app' + includeRootFolder: true + archiveType: 'zip' + archiveFile: '$(System.DefaultWorkingDirectory)/dist/HerbASAP.app.zip' + replaceExistingArchive: true - task: PublishPipelineArtifact@1 - displayName: 'publish macos build output' + displayName: 'publish macos build' inputs: - path: $(System.DefaultWorkingDirectory)/dist/HerbASAP.app + path: '$(System.DefaultWorkingDirectory)/dist/HerbASAP.app.zip' artifact: macos-build - stage: Release From 3d345b5662985af05515ca89b5b611d74167e8bb Mon Sep 17 00:00:00 2001 From: Jacob Motley Date: Tue, 12 May 2020 13:53:57 -0400 Subject: [PATCH 20/26] added github release task --- azure-pipelines.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4a4015c..633ea1e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -76,6 +76,11 @@ stages: displayName: 'download HerbASAP macos build' inputs: artifact: macos-build - - script: dir $(Pipeline.Workspace) - displayName: 'show pipeline workspace directory contents' - \ No newline at end of file + - task: GithubRelease@0 + displayName: 'GitHub Release' + inputs: + gitHubConnection: j-h-m + repositoryName: j-h-m/HerbASAP + assets: | + $(Build.ArtifactStagingDirectory)/*.exe + $(Build.ArtifactStagingDirectory)/*.zip \ No newline at end of file From 60a017b5da1fcbd6925717bf891897eb05257279 Mon Sep 17 00:00:00 2001 From: Jacob Motley Date: Tue, 12 May 2020 14:01:24 -0400 Subject: [PATCH 21/26] 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 633ea1e..5784971 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -79,7 +79,7 @@ stages: - task: GithubRelease@0 displayName: 'GitHub Release' inputs: - gitHubConnection: j-h-m + gitHubConnection: github-j-h-m repositoryName: j-h-m/HerbASAP assets: | $(Build.ArtifactStagingDirectory)/*.exe From 0d10a122708cf24fdf9e2609fd28d9610dbec493 Mon Sep 17 00:00:00 2001 From: Jacob Motley Date: Thu, 14 May 2020 13:37:45 -0400 Subject: [PATCH 22/26] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5784971..94ad0a5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -81,6 +81,7 @@ stages: inputs: gitHubConnection: github-j-h-m repositoryName: j-h-m/HerbASAP + addChangeLog: false assets: | $(Build.ArtifactStagingDirectory)/*.exe $(Build.ArtifactStagingDirectory)/*.zip \ No newline at end of file From b961dbd026ac60f77d6ce4ee28bb63fa0a609014 Mon Sep 17 00:00:00 2001 From: Jacob Motley Date: Thu, 14 May 2020 15:55:29 -0400 Subject: [PATCH 23/26] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 94ad0a5..eaa779b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -72,10 +72,12 @@ stages: displayName: 'download HerbASAP windows build' inputs: artifact: win-build + path: $(Build.ArtifactStagingDirectory) - task: DownloadPipelineArtifact@2 displayName: 'download HerbASAP macos build' inputs: artifact: macos-build + path: $(Build.ArtifactStagingDirectory) - task: GithubRelease@0 displayName: 'GitHub Release' inputs: From 5158c7893e6cd4d6d0df6cf477e30152b0db4f70 Mon Sep 17 00:00:00 2001 From: Jacob Motley Date: Fri, 15 May 2020 21:55:04 -0400 Subject: [PATCH 24/26] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index eaa779b..466bace 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,6 +1,5 @@ trigger: - master -- azure-pipelines stages: - stage: Build From 9c3834ea80aadaf00768d6ec53ff536c36f4bf58 Mon Sep 17 00:00:00 2001 From: Jacob Motley Date: Sat, 16 May 2020 12:29:39 -0400 Subject: [PATCH 25/26] added build status badge to readme --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 73967d6..fdce9db 100644 --- a/README.md +++ b/README.md @@ -4,3 +4,6 @@ # HerbASAP A program created to automate image post processing for natural history collections + +# Build Status +[![Build Status](https://dev.azure.com/FooBarLLC/HerbASAP%20fork/_apis/build/status/j-h-m.HerbASAP?branchName=master)](https://dev.azure.com/FooBarLLC/HerbASAP%20fork/_build/latest?definitionId=5&branchName=master) From 0461709c44e32c6bbede850a39b84753f7d0aab2 Mon Sep 17 00:00:00 2001 From: Jacob Motley Date: Sat, 16 May 2020 12:30:25 -0400 Subject: [PATCH 26/26] make build status text smaller --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fdce9db..74754a5 100644 --- a/README.md +++ b/README.md @@ -5,5 +5,5 @@ # HerbASAP A program created to automate image post processing for natural history collections -# Build Status +## Build Status [![Build Status](https://dev.azure.com/FooBarLLC/HerbASAP%20fork/_apis/build/status/j-h-m.HerbASAP?branchName=master)](https://dev.azure.com/FooBarLLC/HerbASAP%20fork/_build/latest?definitionId=5&branchName=master)