Skip to content

Commit

Permalink
CI: Compile CLI installer in x64 for macOS (#7), also fix all builds
Browse files Browse the repository at this point in the history
* use python 3.5.4 for windows (3.4.4 was removed from Azure)
* change macOS image to 10.14 (10.13 removed)
* upgrade python version for macOS
  • Loading branch information
Dalet committed Apr 21, 2020
1 parent 2def2d4 commit 25b7b90
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions InstallerGUI/mkbundle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ extraArgs=""
if [ "$(uname)" == "Darwin" ]; then
platform="macos"
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/pkgconfig:/Library/Frameworks/Mono.framework/Versions/Current/lib/pkgconfig
export AS="as -arch i386"
export CC="clang -arch i386 -framework CoreFoundation -lobjc -liconv -mmacosx-version-min=10.6"
export AS="as -arch x86_64"
export CC="clang -arch x86_64 -framework CoreFoundation -lobjc -liconv -mmacosx-version-min=10.6"
else
extraArgs="-L /usr/lib/mono/4.5"
if [ "$(uname -m)" == 'x86_64' ]; then
Expand Down
6 changes: 3 additions & 3 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:

- task: UsePythonVersion@0
inputs:
versionSpec: '3.4.4'
versionSpec: '3.5.4'
addToPath: true
- script: python -m pip install --upgrade pip
displayName: 'Install tools'
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:

- job: MacInstaller
pool:
vmImage: 'macOS-10.13'
vmImage: 'macOS-10.14'
dependsOn: WindowsInstaller
steps:
- task: DownloadBuildArtifacts@0
Expand All @@ -113,7 +113,7 @@ jobs:
downloadPath: '$(System.DefaultWorkingDirectory)/Installer'
- task: UsePythonVersion@0
inputs:
versionSpec: '3.4.8'
versionSpec: '3.5.9'
addToPath: true

- script: python -m pip install --upgrade pip
Expand Down

0 comments on commit 25b7b90

Please sign in to comment.