From cd2a367bb62c39dc38e75823c906278983c407f6 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Mon, 18 Jul 2022 18:57:05 +0200 Subject: [PATCH 1/5] Switch from Travis-CI to GitHub Actions --- .github/workflows/build.yml | 35 +++++++++++++++++++++++++++++++++++ .travis.yml | 12 ------------ README.md | 2 +- 3 files changed, 36 insertions(+), 13 deletions(-) create mode 100644 .github/workflows/build.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..152207e --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,35 @@ +name: JCA build + +on: [push, pull_request] + +jobs: + build: + runs-on: ubuntu-latest + strategy: + matrix: + java: [ '8', '11', '16' ] + name: Java ${{ matrix.java }} + steps: + - uses: actions/checkout@v3 + + - name: Set up JDK ${{ matrix.java }} + uses: actions/setup-java@v3 + with: + java-version: ${{ matrix.java }} + distribution: 'temurin' + cache: maven + + - name: Build + run: mvn -B verify + + - name: Create site + run: mvn -B site + if: ${{ github.ref == 'refs/heads/master' && matrix.java == '11' }} + + - name: Deploy site + uses: peaceiris/actions-gh-pages@v3 + if: ${{ github.ref == 'refs/heads/master' && matrix.java == '11' }} + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: ./target/site + force_orphan: true \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 7de4488..0000000 --- a/.travis.yml +++ /dev/null @@ -1,12 +0,0 @@ -sudo: required - -jdk: - - openjdk8 - - openjdk11 - -script: - - mvn -q clean verify - -after_failure: - - find ./ -type d -name "surefire-reports" -print0 | xargs -0 -I {} find {} -iname "*.txt" -type f | xargs cat - - find . -type f -name "*.log" -print0 -exec cat {} \; diff --git a/README.md b/README.md index ef5eedd..fd3a1e5 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# jca [![Build Status](https://travis-ci.org/epics-base/jca.svg?branch=master)](https://travis-ci.org/epics-base/jca) +# jca [![Build Status](https://github.com/epics-base/jca/actions/workflows/build.yml/badge.svg) Java Channel Access client and server API and a pure java implementation for both. From fa10046b683210112a0a2b94b343a0d9fa2216ff Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Tue, 19 Jul 2022 15:18:33 +0200 Subject: [PATCH 2/5] ci: don't fail-fast; move site into separate job --- .github/workflows/build.yml | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 152207e..c145689 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,9 +3,11 @@ name: JCA build on: [push, pull_request] jobs: + build: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: java: [ '8', '11', '16' ] name: Java ${{ matrix.java }} @@ -19,17 +21,29 @@ jobs: distribution: 'temurin' cache: maven - - name: Build + - name: Build and Test run: mvn -B verify + site: + runs-on: ubuntu-latest + name: Build and Deploy site + if: ${{ github.ref == 'refs/heads/master' }} + steps: + - uses: actions/checkout@v3 + + - name: Set up JDK 11 + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'temurin' + cache: maven + - name: Create site - run: mvn -B site - if: ${{ github.ref == 'refs/heads/master' && matrix.java == '11' }} + run: mvn -B -DskipTests compile site - - name: Deploy site + - name: Push site to gh-pages uses: peaceiris/actions-gh-pages@v3 - if: ${{ github.ref == 'refs/heads/master' && matrix.java == '11' }} with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: ./target/site - force_orphan: true \ No newline at end of file + force_orphan: true \ No newline at end of file From 0f1a0cf3ae2f8a3b0f86c17c78085b171a8c4ce8 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Wed, 20 Jul 2022 12:11:16 +0200 Subject: [PATCH 3/5] ci: allow Java 16 to fail, add --update-snapshots (closes #67) --- .github/workflows/build.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c145689..ca82ef0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,11 +6,16 @@ jobs: build: runs-on: ubuntu-latest + continue-on-error: ${{ matrix.may_fail }} strategy: fail-fast: false matrix: - java: [ '8', '11', '16' ] - name: Java ${{ matrix.java }} + java: [ '8', '11' ] + may_fail: [ false ] + include: + - java: '16' + may_fail: true + name: Build on Java ${{ matrix.java }} steps: - uses: actions/checkout@v3 @@ -22,11 +27,11 @@ jobs: cache: maven - name: Build and Test - run: mvn -B verify + run: mvn --batch-mode --update-snapshots verify site: runs-on: ubuntu-latest - name: Build and Deploy site + name: Generate and Deploy site if: ${{ github.ref == 'refs/heads/master' }} steps: - uses: actions/checkout@v3 From 1a9d96671baae734c9c34567a0488608673844bb Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Wed, 20 Jul 2022 11:48:10 +0200 Subject: [PATCH 4/5] POM: update Maven plugin versions; update junit version - maven-changes-plugin -> 2.12.1 - maven-jxr-plugin -> 3.2.0 - maven-compiler-plugin -> 3.10.1 - maven-source-plugin -> 3.2.1 - maven-jar-plugin -> 3.2.2 - maven-javadoc-plugin -> 2.10.4 - maven-surefire-plugin -> 2.19.1 - maven-project-info-reports -> 3.3.0 - maven-site-plugin -> 4.0.0-M1 - maven-bundle-plugin -> 5.1.6 - junit -> 4.13.2 --- pom.xml | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index aa56130..d9a7513 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,7 @@ org.apache.felix maven-bundle-plugin - 2.5.3 + 5.1.6 true @@ -109,7 +109,7 @@ maven-jar-plugin - 2.5 + 3.2.2 ${project.build.outputDirectory}/META-INF/MANIFEST.MF @@ -117,18 +117,16 @@ - org.apache.maven.plugins maven-compiler-plugin - 2.0.2 + 3.10.1 1.8 1.8 - org.apache.maven.plugins maven-surefire-plugin - 2.12.4 + 2.19.1 @@ -140,9 +138,8 @@ - org.apache.maven.plugins maven-source-plugin - 2.2.1 + 3.2.1 @@ -164,9 +161,8 @@ - org.apache.maven.plugins maven-javadoc-plugin - 2.9 + 2.10.4 ${javadoc.doclint.none} 1.8 @@ -180,27 +176,34 @@ + + maven-site-plugin + 4.0.0-M1 + junit junit - 4.12 + 4.13.2 test + - org.apache.maven.plugins + maven-project-info-reports-plugin + 3.3.0 + + maven-javadoc-plugin - 2.9 + 2.10.4 - org.apache.maven.plugins maven-changes-plugin - 2.3 + 2.12.1 @@ -213,9 +216,8 @@ - org.apache.maven.plugins maven-jxr-plugin - 2.3 + 3.2.0 From 0d6cf83ff395a5326ebe36f7e562de34fad377eb Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Tue, 19 Jul 2022 16:23:37 +0200 Subject: [PATCH 5/5] site: add schema to changes.xml --- xdocs/changes.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 5a692af..fd0ac42 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -1,4 +1,6 @@ - + JCA Changes page Matej Sekoranja