From c91ce00030e16d1458f96207161450ac9ba965e6 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Thu, 26 Nov 2020 13:16:15 +0100 Subject: [PATCH] This repository moved to roburio organization Adapt CI: use GitHub actions instead of travis for Linux testing, only a single cirrus runner --- .cirrus.yml | 3 --- .github/workflows/build.yml | 33 +++++++++++++++++++++++++++++++++ .travis.yml | 18 ------------------ README.md | 4 +--- albatross.opam | 7 +++---- packaging/FreeBSD/MANIFEST | 2 +- src/dune | 2 +- 7 files changed, 39 insertions(+), 30 deletions(-) create mode 100644 .github/workflows/build.yml delete mode 100644 .travis.yml diff --git a/.cirrus.yml b/.cirrus.yml index ee32ff8..13f4a52 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -4,9 +4,6 @@ freebsd_instance: freebsd_task: env: matrix: - - OCAML_VERSION: 4.08.1 - - OCAML_VERSION: 4.09.1 - - OCAML_VERSION: 4.10.1 - OCAML_VERSION: 4.11.1 pkg_install_script: pkg install -y ocaml-opam gmp gmake pkgconf bash ocaml_script: opam init -a --comp=$OCAML_VERSION diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..003de77 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,33 @@ +name: Albatross + +on: [push, pull_request] + +jobs: + tests: + name: Tests + + strategy: + fail-fast: false + matrix: + ocaml-version: ["4.11.1", "4.10.1", "4.09.0", "4.08.1"] + operating-system: [ubuntu-latest] + + runs-on: ${{ matrix.operating-system }} + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Use OCaml ${{ matrix.ocaml-version }} + uses: avsm/setup-ocaml@v1 + with: + ocaml-version: ${{ matrix.ocaml-version }} + + - name: Install dependencies + run: | + opam pin add -n albatross . + opam depext -y albatross + opam install -t --deps-only . + + - name: Build + run: opam exec -- dune build diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 11691a3..0000000 --- a/.travis.yml +++ /dev/null @@ -1,18 +0,0 @@ -language: c -install: wget https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.travis-docker.sh -script: bash -ex .travis-docker.sh -sudo: false -services: - - docker -env: - global: - - PACKAGE="albatross" - - DISTRO=ubuntu-lts - - TESTS=false - matrix: - - OCAML_VERSION=4.08 - - OCAML_VERSION=4.09 - - OCAML_VERSION=4.10 - - OCAML_VERSION=4.11 -notifications: - email: false diff --git a/README.md b/README.md index 57c7c7f..ae05142 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ # Albatross: orchestrate and manage MirageOS unikernels with Solo5 -[![Build Status](https://travis-ci.org/hannesm/albatross.svg?branch=master)](https://travis-ci.org/hannesm/albatross) - The goal of albatross is robust deployment of [MirageOS](https://mirage.io) unikernels using [Solo5](https://github.com/solo5/solo5). Resources managed by albatross are network interfaces of kind `tap`, which are connected to @@ -85,7 +83,7 @@ The following command-line applications for local and remote management are prov ## Installation To install Albatross, run `opam pin add albatross -https://github.com/hannesm/albatross`. +https://github.com/roburio/albatross`. Init scripts for FreeBSD are provided in the `packaging/FreeBSD/rc.d` subdirectory, and a script to create a FreeBSD package diff --git a/albatross.opam b/albatross.opam index 74d1ac9..b9e3b86 100644 --- a/albatross.opam +++ b/albatross.opam @@ -1,9 +1,9 @@ opam-version: "2.0" maintainer: "Hannes Mehnert " authors: ["Hannes Mehnert "] -homepage: "https://github.com/hannesm/albatross" -dev-repo: "git+https://github.com/hannesm/albatross.git" -bug-reports: "https://github.com/hannesm/albatross/issues" +homepage: "https://github.com/roburio/albatross" +dev-repo: "git+https://github.com/roburio/albatross.git" +bug-reports: "https://github.com/roburio/albatross/issues" license: "ISC" depends: [ @@ -13,7 +13,6 @@ depends: [ "conf-pkg-config" {build} "lwt" {>= "3.0.0"} "ipaddr" {>= "4.0.0"} - "hex" "cstruct" "logs" "rresult" diff --git a/packaging/FreeBSD/MANIFEST b/packaging/FreeBSD/MANIFEST index 4a9ab0a..1cdb9ab 100644 --- a/packaging/FreeBSD/MANIFEST +++ b/packaging/FreeBSD/MANIFEST @@ -2,7 +2,7 @@ name: albatross version: 1.0.%%GITVER%%_1 origin: local/albatross comment: Albatross: orchestrate and manage MirageOS unikernels with Solo5 -www: https://github.com/hannesm/albatross +www: https://github.com/roburio/albatross maintainer: Hannes Mehnert prefix: /usr/local licenselogic: single diff --git a/src/dune b/src/dune index 0c6bda0..5360f0d 100644 --- a/src/dune +++ b/src/dune @@ -2,5 +2,5 @@ (name albatross) (public_name albatross) (wrapped false) - (libraries rresult logs ipaddr bos hex ptime astring duration cstruct jsonm + (libraries rresult logs ipaddr bos ptime astring duration cstruct jsonm decompress lwt lwt.unix ptime.clock.os asn1-combinators metrics))