Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
54b60d0
Set up CI with Azure Pipelines
Jan 28, 2020
16591d5
Merge branch 'master' into azure-pipelines
Feb 27, 2020
e02b1a3
added jobs for windows and osx
Feb 27, 2020
84bccc4
fix job description syntax
Feb 27, 2020
07e4a94
add update pip, install wheel and pyinstaller
Feb 27, 2020
d0f612a
added pip requirements install
Feb 27, 2020
c741b7c
added pyinstaller step
Feb 27, 2020
06907dd
mispelled file name
Feb 27, 2020
d31de9d
copy spec file to root so commands in spec file have correct file pat…
Mar 1, 2020
2a7b668
windows directories \ not /
Mar 1, 2020
a1f45cf
run command on copied file
Mar 1, 2020
dbfcd18
add build artifact publishing
Mar 3, 2020
9846caf
change directory for build output, also echo default working director…
Mar 3, 2020
235167a
cucked by cmd
Mar 3, 2020
151f32c
added temporary tasks to get idea of build vm directory structure aft…
Mar 3, 2020
4a58035
show contents of dist directory
Mar 4, 2020
0447ef7
let's give it the good ole college try
Mar 4, 2020
8d9d9eb
start building github release job by downloading artifacts
Mar 4, 2020
6801374
add stages
Mar 4, 2020
30420f8
zip the mac os ".app" build output before releasing (other os just se…
May 12, 2020
3d345b5
added github release task
May 12, 2020
60a017b
Update azure-pipelines.yml for Azure Pipelines
May 12, 2020
0d10a12
Update azure-pipelines.yml for Azure Pipelines
May 14, 2020
b961dbd
Update azure-pipelines.yml for Azure Pipelines
May 14, 2020
5158c78
Update azure-pipelines.yml for Azure Pipelines
May 16, 2020
9a1c4f5
Merge pull request #1 from j-h-m/azure-pipelines
May 16, 2020
9c3834e
added build status badge to readme
May 16, 2020
0461709
make build status text smaller
May 16, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
88 changes: 88 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
trigger:
- master

stages:
- stage: Build
jobs:
- job: 'Build_PyInstaller_Windows'
pool:
vmImage: 'windows-latest'
steps:
- 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'
- 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 ./win-build.spec
displayName: 'build HerbASAP pyinstaller'
- task: PublishPipelineArtifact@1
displayName: 'publish windows build output'
inputs:
path: $(System.DefaultWorkingDirectory)/dist/HerbASAP.exe
artifact: win-build

- job: 'Build_PyInstaller_MacOS'
pool:
vmImage: 'macOS-latest'
steps:
- 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'
- script: python -m pip install -r ./requirements.txt
displayName: 'install HerbASAP requirements'
- 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'
- 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'
inputs:
path: '$(System.DefaultWorkingDirectory)/dist/HerbASAP.app.zip'
artifact: macos-build

- stage: Release
jobs:
- job: 'Github_Release'
pool:
vmImage: 'windows-latest'
steps:
- task: DownloadPipelineArtifact@2
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:
gitHubConnection: github-j-h-m
repositoryName: j-h-m/HerbASAP
addChangeLog: false
assets: |
$(Build.ArtifactStagingDirectory)/*.exe
$(Build.ArtifactStagingDirectory)/*.zip
2 changes: 1 addition & 1 deletion docs/build_docs/macos-build.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down