diff options
| author | Théo Zimmermann | 2020-11-05 17:15:04 +0100 |
|---|---|---|
| committer | Théo Zimmermann | 2020-11-05 17:15:04 +0100 |
| commit | 602af83f83cfce52c63e6123689126d50c49f30d (patch) | |
| tree | d7d381ce82082235212aed16da7b4ad4893ded36 | |
| parent | afc828b3e207dd39c59d1501d570a88b2012fd2c (diff) | |
Fix macOS CI / disable bundle generation.
Fix macOS CI build by removing the failing 'brew update' step and
unpinning homebrew.
Unfortunately, because of problems discovered in #12672 during the
previous attempt to fix #12657, this makes the bundle generation step
fail.
| -rw-r--r-- | azure-pipelines.yml | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 41b5210f45..46bd4367a7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -62,16 +62,9 @@ jobs: - script: | set -e - brew update - (cd $(brew --repository)/Library/Taps/homebrew/homebrew-core/ && git fetch --shallow-since=${HBCORE_DATE} && git checkout ${HBCORE_REF}) - brew install gnu-time opam pkg-config gtksourceview3 adwaita-icon-theme gmp || true - # || true: workaround #12657, see also #12672 and commit message for this line + brew install gnu-time opam gtksourceview3 adwaita-icon-theme pip3 install macpack displayName: 'Install system dependencies' - env: - HOMEBREW_NO_AUTO_UPDATE: "1" - HBCORE_DATE: "2019-09-03" - HBCORE_REF: "44ee64cf4b9f2d2bf000758d356db0c77425e42e" - script: | set -e @@ -107,17 +100,17 @@ jobs: make install displayName: 'Install Coq' - - script: | - set -e - eval $(opam env) - export PKG_CONFIG_PATH=/usr/local/opt/libffi/lib/pkgconfig - ./dev/build/osx/make-macos-dmg.sh - mv _build/*.dmg "$(Build.ArtifactStagingDirectory)/" - displayName: 'Create the dmg bundle' - env: - OUTDIR: '$(Build.BinariesDirectory)' - - - task: PublishBuildArtifacts@1 - inputs: - pathtoPublish: '$(Build.ArtifactStagingDirectory)' - artifactName: coq-macOS-installer +# - script: | +# set -e +# eval $(opam env) +# export PKG_CONFIG_PATH=/usr/local/opt/libffi/lib/pkgconfig +# ./dev/build/osx/make-macos-dmg.sh +# mv _build/*.dmg "$(Build.ArtifactStagingDirectory)/" +# displayName: 'Create the dmg bundle' +# env: +# OUTDIR: '$(Build.BinariesDirectory)' + +# - task: PublishBuildArtifacts@1 +# inputs: +# pathtoPublish: '$(Build.ArtifactStagingDirectory)' +# artifactName: coq-macOS-installer |