Skip to content

Commit

Permalink
Merge pull request #137 from samoht/release
Browse files Browse the repository at this point in the history
Prepare the release
  • Loading branch information
samoht authored May 3, 2017
2 parents 65fd276 + b6d9b48 commit 299a30b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:
- DISTRO="debian-testing" OCAML_VERSION="4.03.0"
- DISTRO="debian-unstable" OCAML_VERSION="4.04.0"
- DISTRO="ubuntu-14.04" OCAML_VERSION="4.02.3"
- DISTRO="ubuntu-16.04" OCAML_VERSION="4.05.0"
- DISTRO="ubuntu-16.04" OCAML_VERSION="4.05.0" DEPOPTS="ppx_tools_versioned lwt"
- DISTRO="centos-7" OCAML_VERSION="4.03.0"
- DISTRO="centos-6" OCAML_VERSION="4.02.3"
- DISTRO="alpine-3.5" OCAML_VERSION="4.04.0"
Expand Down
4 changes: 4 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2.4.1 (2017-050-03):

- fix missing ppx_tools_versioned dependency (#136, @et-def)

2.4.0 (2017-03-30):

Distribute the PPX extension so that it is compatible with Jbuilder.
Expand Down
10 changes: 5 additions & 5 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ platform:
- x86

environment:
CYG_ROOT: "C:\\cygwin"
CYG_BASH: "%CYG_ROOT%\\bin\\bash -lc"
FORK_USER: ocaml
FORK_BRANCH: master
CYG_ROOT: C:\cygwin64

install:
- appveyor DownloadFile https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/appveyor-opam.sh
- "%CYG_ROOT%\\setup-x86.exe -qnNdO -R %CYG_ROOT% -s http://cygwin.mirror.constant.com -l C:/cygwin/var/cache/setup -P rsync -P patch -P make -P unzip -P git -P m4 -P perl -P mingw64-x86_64-gcc-core"
- 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_BASH% '${APPVEYOR_BUILD_FOLDER}/appveyor-opam.sh'"
- call %CYG_ROOT%\bin\bash.exe -l %APPVEYOR_BUILD_FOLDER%\appveyor-opam.sh

0 comments on commit 299a30b

Please sign in to comment.