Skip to content

Add support for OCaml 4.12 #88

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.

Sign up for GitHub

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

Merged
hannesm merged 3 commits into from
Mar 3, 2021
Merged

Add support for OCaml 4.12 #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
693e7da
Add support for OCaml 4.12
kit-ty-kate Nov 6, 2020
ca1a9ec
Update CI
kit-ty-kate Feb 25, 2021
00ac72e
Update opam file
kit-ty-kate Feb 25, 2021
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
5 changes: 3 additions & 2 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ freebsd_task:
matrix:
- OCAML_VERSION: 4.08.1
- OCAML_VERSION: 4.09.1
- OCAML_VERSION: 4.10.1
- OCAML_VERSION: 4.11.1
- OCAML_VERSION: 4.10.2
- OCAML_VERSION: 4.11.2
- OCAML_VERSION: 4.12.0
pkg_install_script: pkg install -y ocaml-opam gmp gmake pkgconf bash
ocaml_script: opam init -a --comp=$OCAML_VERSION
solo5_script: eval `opam env` && opam install solo5-bindings-hvt
Expand Down
34 changes: 20 additions & 14 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,28 +14,34 @@ env:
jobs:
include:
# Build using the latest OCaml release on most common targets and architectures.
- name: OCaml 4.11, Solo5/hvt (amd64)
- name: OCaml 4.12, Solo5/hvt (amd64)
arch: amd64
env: OCAML_VERSION=4.11 EXTRA_DEPS="solo5-bindings-hvt" EXTRA_ENV="MIRAGE_TEST_MODE=hvt"
- name: OCaml 4.11, Solo5/hvt, system switch (amd64)
env: OCAML_VERSION=4.12 EXTRA_DEPS="solo5-bindings-hvt" EXTRA_ENV="MIRAGE_TEST_MODE=hvt"
- name: OCaml 4.12, Solo5/hvt (amd64)
arch: amd64
env: OCAML_VERSION=4.11 INSTALL_LOCAL=1 EXTRA_DEPS="solo5-bindings-hvt" EXTRA_ENV="MIRAGE_TEST_MODE=hvt"
- name: OCaml 4.11, Solo5/spt (amd64)
env: OCAML_VERSION=4.12 EXTRA_DEPS="solo5-bindings-hvt" EXTRA_ENV="MIRAGE_TEST_MODE=hvt"
- name: OCaml 4.12, Solo5/hvt, system switch (amd64)
arch: amd64
env: OCAML_VERSION=4.11 EXTRA_DEPS="solo5-bindings-spt" EXTRA_ENV="MIRAGE_TEST_MODE=spt"
- name: OCaml 4.11, Solo5/virtio (amd64)
env: OCAML_VERSION=4.12 INSTALL_LOCAL=1 EXTRA_DEPS="solo5-bindings-hvt" EXTRA_ENV="MIRAGE_TEST_MODE=hvt"
- name: OCaml 4.12, Solo5/spt (amd64)
arch: amd64
env: OCAML_VERSION=4.11 EXTRA_DEPS="solo5-bindings-virtio" EXTRA_ENV="MIRAGE_TEST_MODE=virtio"
- name: OCaml 4.11, Solo5/muen (amd64)
env: OCAML_VERSION=4.12 EXTRA_DEPS="solo5-bindings-spt" EXTRA_ENV="MIRAGE_TEST_MODE=spt"
- name: OCaml 4.12, Solo5/virtio (amd64)
arch: amd64
env: OCAML_VERSION=4.11 EXTRA_DEPS="solo5-bindings-muen" EXTRA_ENV="MIRAGE_TEST_MODE=muen"
- name: OCaml 4.11, Solo5/hvt (arm64)
env: OCAML_VERSION=4.12 EXTRA_DEPS="solo5-bindings-virtio" EXTRA_ENV="MIRAGE_TEST_MODE=virtio"
- name: OCaml 4.12, Solo5/muen (amd64)
arch: amd64
env: OCAML_VERSION=4.12 EXTRA_DEPS="solo5-bindings-muen" EXTRA_ENV="MIRAGE_TEST_MODE=muen"
- name: OCaml 4.12, Solo5/hvt (arm64)
arch: arm64
env: OCAML_VERSION=4.11 EXTRA_DEPS="solo5-bindings-hvt" EXTRA_ENV="MIRAGE_TEST_MODE=hvt"
- name: OCaml 4.11, Solo5/spt (arm64)
env: OCAML_VERSION=4.12 EXTRA_DEPS="solo5-bindings-hvt" EXTRA_ENV="MIRAGE_TEST_MODE=hvt"
- name: OCaml 4.12, Solo5/spt (arm64)
arch: arm64
env: OCAML_VERSION=4.11 EXTRA_DEPS="solo5-bindings-spt" EXTRA_ENV="MIRAGE_TEST_MODE=spt"
env: OCAML_VERSION=4.12 EXTRA_DEPS="solo5-bindings-spt" EXTRA_ENV="MIRAGE_TEST_MODE=spt"
# Build previous but still supported OCaml releases only on amd64 and hvt.
- name: OCaml 4.11, Solo5/hvt (amd64)
arch: amd64
env: OCAML_VERSION=4.11 EXTRA_DEPS="solo5-bindings-hvt" EXTRA_ENV="MIRAGE_TEST_MODE=hvt"
- name: OCaml 4.10, Solo5/hvt (amd64)
arch: amd64
env: OCAML_VERSION=4.10 EXTRA_DEPS="solo5-bindings-hvt" EXTRA_ENV="MIRAGE_TEST_MODE=hvt"
Expand Down
3 changes: 3 additions & 0 deletions nolibc/include/sys/stat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#ifndef _SYS_STAT_H
#define _SYS_STAT_H

#include <sys/types.h>

struct stat {
int st_mode;
};
Expand All @@ -9,5 +11,6 @@ struct stat {
#define S_IFREG 0
#define S_ISREG(x) (0)
int stat(const char *, struct stat *);
int mkdir(const char *, mode_t);

#endif
1 change: 1 addition & 0 deletions nolibc/include/sys/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@
typedef int pid_t;
typedef int off_t;
typedef int ssize_t;
typedef int mode_t;

#endif
1 change: 1 addition & 0 deletions nolibc/include/unistd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ ssize_t read(int, void *, size_t);
ssize_t write(int, const void *, size_t);
ssize_t readlink(const char *, char *, size_t);
int unlink(const char *);
int rmdir(const char *);

#endif
2 changes: 2 additions & 0 deletions nolibc/stubs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ STUB_IGNORE(off_t, lseek, -1);
STUB_ABORT(read);
STUB_IGNORE(int, readlink, -1);
STUB_ABORT(unlink);
STUB_ABORT(rmdir);

/* dirent.h */
STUB_WARN_ONCE(int, closedir, -1);
Expand All @@ -98,3 +99,4 @@ STUB_ABORT(strerror);

/* sys/stat.h */
STUB_WARN_ONCE(int, stat, -1);
STUB_ABORT(mkdir);
2 changes: 1 addition & 1 deletion opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ depends: [
"ocamlfind" {build}
"ocaml-src" {build}
("solo5-bindings-hvt" | "solo5-bindings-spt" | "solo5-bindings-virtio" | "solo5-bindings-muen" | "solo5-bindings-genode" | "solo5-bindings-xen")
"ocaml" {>= "4.08.0" & < "4.12.0"}
"ocaml" {>= "4.08.0" & < "4.13.0"}
]
substs: [
"flags/cflags.tmp"
Expand Down