From ca355af0c4a292856e9c2f31463ad96b254df62e Mon Sep 17 00:00:00 2001 From: David Renshaw Date: Fri, 4 Dec 2020 17:08:31 -0500 Subject: [PATCH 1/3] add github actions config --- .github/workflows/ci.yml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..844fed7 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,33 @@ +name: CI + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Install Cap'n Proto + run: | + export DEBIAN_FRONTEND=noninteractive + sudo apt-get install -y capnproto libcapnp-dev + + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + + - name: Build with Maven + run: | + make + mvn compile + + - name: Run tests + run: mvn test From a081a37140a0a8716cc5d7016543f74211f022c2 Mon Sep 17 00:00:00 2001 From: David Renshaw Date: Fri, 4 Dec 2020 17:15:16 -0500 Subject: [PATCH 2/3] remove travis config TravisCI is no longer free starting January 2021. We will use Github Actions instead. --- .travis.yml | 33 --------------------------------- README.md | 2 +- 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index fef94bd..0000000 --- a/.travis.yml +++ /dev/null @@ -1,33 +0,0 @@ -dist: trusty -sudo: false -language: java -env: - global: - - export PATH="$PATH:$HOME/bin" - - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/lib" - - export PKG_CONFIG_PATH="$HOME/lib/pkgconfig" -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - gcc-7 - - g++-7 - -install: - - curl -O https://capnproto.org/capnproto-c++-0.7.0.tar.gz - - tar zxf capnproto-c++-0.7.0.tar.gz - - cd capnproto-c++-0.7.0 - - ./configure --prefix=$HOME CC=gcc-7 CXX=g++-7 - - make -j3 - - make install - - cd ../ - -jdk: - - oraclejdk8 - - openjdk8 -script: - - make CC=gcc-7 CXX=g++-7 - - mvn compile - - mvn test - diff --git a/README.md b/README.md index 2a9c3fa..88f1940 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # capnproto-java: Cap'n Proto for Java -[![Build Status](https://travis-ci.org/capnproto/capnproto-java.svg?branch=master)](https://travis-ci.org/capnproto/capnproto-java) +[![Build Status](https://github.com/capnproto/capnproto-java/workflows/CI/badge.svg?branch=master&event=push)](https://github.com/capnproto/capnproto-java/actions?query=workflow%3ACI) [Cap'n Proto](http://capnproto.org) is an extremely efficient protocol for sharing data and capabilities, and capnproto-java is a pure Java implementation. From cf62cd4a5889d3e770bfe04188468ed48fbc9f2e Mon Sep 17 00:00:00 2001 From: David Renshaw Date: Sun, 6 Dec 2020 20:47:48 -0500 Subject: [PATCH 3/3] Fix build on Fedora 33 --- benchmark/pom.xml | 2 ++ examples/pom.xml | 2 ++ runtime/pom.xml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/benchmark/pom.xml b/benchmark/pom.xml index f9f4816..6f2aafd 100644 --- a/benchmark/pom.xml +++ b/benchmark/pom.xml @@ -31,6 +31,8 @@ UTF-8 + 1.8 + 1.8 diff --git a/examples/pom.xml b/examples/pom.xml index bf3648e..ff0190f 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -31,6 +31,8 @@ UTF-8 + 1.8 + 1.8 diff --git a/runtime/pom.xml b/runtime/pom.xml index 1a65045..9f0ab52 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -31,6 +31,8 @@ UTF-8 + 1.8 + 1.8