aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Laporte2019-04-03 12:07:10 +0000
committerVincent Laporte2019-04-16 09:13:45 +0000
commitd960ff1028cf19f497871d7f0c5f0ae2143a73b3 (patch)
tree91467223940f375015ba95e2dd3ccc5d1f7097e0
parent4c94ab5c4ba29334fa0d7586e68d1074c0c7a487 (diff)
[CI/Azure/macOS] Install Coq into an artifact
-rw-r--r--azure-pipelines.yml22
-rwxr-xr-xdev/build/osx/make-macos-dmg.sh3
2 files changed, 22 insertions, 3 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index a234ee3355..12a4d72f4c 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -50,6 +50,7 @@ jobs:
set -e
brew update
brew install gnu-time opam pkg-config gtksourceview3
+ pip3 install macpack
displayName: 'Install system dependencies'
- script: |
@@ -71,7 +72,7 @@ jobs:
set -e
eval $(opam env)
- ./configure -local -warn-error yes -native-compiler no -coqide opt
+ ./configure -prefix '$(Build.BinariesDirectory)' -warn-error yes -native-compiler no -coqide opt
make -j "$NJOBS"
displayName: 'Build Coq'
@@ -79,3 +80,22 @@ jobs:
eval $(opam env)
make -j "$NJOBS" test-suite PRINT_LOGS=1
displayName: 'Run Coq Test Suite'
+
+ - script: |
+ 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
diff --git a/dev/build/osx/make-macos-dmg.sh b/dev/build/osx/make-macos-dmg.sh
index c450e8157a..3a096fec06 100755
--- a/dev/build/osx/make-macos-dmg.sh
+++ b/dev/build/osx/make-macos-dmg.sh
@@ -4,7 +4,6 @@
set -e
# Configuration setup
-OUTDIR=$PWD/_install
DMGDIR=$PWD/_dmg
VERSION=$(sed -n -e '/^let coq_version/ s/^[^"]*"\([^"]*\)"$/\1/p' configure.ml)
APP=bin/CoqIDE_${VERSION}.app
@@ -13,7 +12,7 @@ APP=bin/CoqIDE_${VERSION}.app
make PRIVATEBINARIES="$APP" -j "$NJOBS" -l2 "$APP"
# Add Coq to the .app file
-make OLDROOT="$OUTDIR" COQINSTALLPREFIX="$APP/Contents/Resources/" install-coq install-ide-toploop
+make OLDROOT="$OUTDIR" COQINSTALLPREFIX="$APP/Contents/Resources" install-coq install-ide-toploop
# Create the dmg bundle
mkdir -p "$DMGDIR"