Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use ocaml-ci-scripts for the appveyor build #517

Merged
merged 3 commits into from
May 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
38 changes: 11 additions & 27 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,36 +1,20 @@
os: unstable

platform:
- x64
- x86

environment:
global:
CYG_ARCH: x86
CYG_ROOT: C:/cygwin
matrix:
- WODI_ARCH: 32
MINGW_ARCH: i686
WODI_FILE: https://dl.dropbox.com/sh/t9ozci9rso9gij4/AABS0ZGie-RdZDxyRaDKImWVa/wodi32.tar.xz
WODI_PACKAGES_FILE: https://dl.dropbox.com/sh/feldcwshtinmdo8/AAAaEK0cJoB1h6UDh4Vbvpaaa/packages32.tar.xz
- WODI_ARCH: 64
MINGW_ARCH: x86_64
WODI_FILE: https://dl.dropbox.com/sh/t9ozci9rso9gij4/AADtoDkuFC9ALiLduQ73VOzla/wodi64.tar.xz
WODI_PACKAGES_FILE: https://dl.dropbox.com/sh/feldcwshtinmdo8/AADlqehWQ17xVWCW2GGHIo_za/packages64.tar.xz
init:
- 'echo System architecture: %PLATFORM%'
- appveyor DownloadFile "%WODI_FILE%" -FileName "C:/wodi%WODI_ARCH%.tar.xz"
- appveyor DownloadFile "%WODI_PACKAGES_FILE%" -FileName "C:/packages%WODI_ARCH%.tar.xz"
PACKAGE: ctypes
FORK_USER: ocaml
FORK_BRANCH: master
CYG_ROOT: C:\cygwin64
EXTRA_DEPS: ctypes-foreign
matrix:
- OPAM_SWITCH: 4.03.0+mingw64c
- OPAM_SWITCH: 4.03.0+mingw32c

install:
- if not exist "%CYG_ROOT%" mkdir "%CYG_ROOT%"
- appveyor DownloadFile "http://cygwin.com/setup-%CYG_ARCH%.exe" -FileName "%CYG_ROOT%\setup.exe"
- '"%CYG_ROOT%\setup.exe" -qnBWNd -R "%CYG_ROOT%" -P cygwin -P wget -P dos2unix -P diffutils -P cpio -P make -P patch -P mingw64-%MINGW_ARCH%-gcc-core -P mingw64-%MINGW_ARCH%-gcc-g++ >NUL'
- '%CYG_ROOT%/bin/bash -lc "cygcheck -dc cygwin"'
- '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\" && ./appveyor/install.sh %WODI_ARCH% %MINGW_ARCH% wodi%WODI_ARCH%.tar.xz packages%WODI_ARCH%.tar.xz"'
- ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/$env:FORK_USER/ocaml-ci-scripts/$env:FORK_BRANCH/appveyor-install.ps1"))

build_script:
- '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\" && ./appveyor/build.sh %WODI_ARCH%"'

artifacts:
- path: test.log
name: test-logs
- call %CYG_ROOT%\bin\bash.exe -l %APPVEYOR_BUILD_FOLDER%\appveyor-opam.sh
87 changes: 0 additions & 87 deletions appveyor/build.sh

This file was deleted.

28 changes: 0 additions & 28 deletions appveyor/findlib-patch-create-process.patch

This file was deleted.

33 changes: 0 additions & 33 deletions appveyor/install.sh

This file was deleted.

3 changes: 2 additions & 1 deletion ctypes.opam
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ depends: [
"lwt" {test}
"ctypes-foreign" {test}
"ounit" {test}
"conf-ncurses" {test}
]
depopts: [
"ctypes-foreign"
Expand All @@ -37,7 +38,7 @@ depopts: [
]
build-test: [
[make "COVERAGE=true" {bisect_ppx:installed} "test"]
[make "COVERAGE=true" {bisect_ppx:installed} "run-examples"]
[make "COVERAGE=true" {bisect_ppx:installed} "run-examples" ] {os != "win32"}
["sh" "-c" "ocveralls" "--send bisect*.out" "_build/bisect*.out" ">" "coveralls.json"] {bisect_ppx:installed}
]
tags: ["org:ocamllabs" "org:mirage"]
Expand Down