From 661c194d06b9372bff95f3c21c535e796688ad81 Mon Sep 17 00:00:00 2001 From: Civitaspo Date: Fri, 24 Apr 2020 06:50:16 +0900 Subject: [PATCH 1/6] Fix the test environment --- build.gradle | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index ba01179..107de88 100644 --- a/build.gradle +++ b/build.gradle @@ -23,14 +23,19 @@ dependencies { compile("com.jayway.jsonpath:json-path:2.4.0") { exclude group: "org.slf4j", module: "slf4j-api" } - testCompile "junit:junit:4.+" - testCompile "org.embulk:embulk-core:0.9.23:tests" - + testImplementation "junit:junit:4.+" + testImplementation "org.embulk:embulk-core:0.9.23:tests" + testImplementation "org.embulk:embulk-core:0.9.23" // TODO: Remove them. // They are now required because the dependency libraries of them are behind sub ClassLoaders. // Including them in "testCompile" is a tentative workaround. - testCompile "org.embulk:embulk-deps-buffer:0.9.23" - testCompile "org.embulk:embulk-deps-config:0.9.23" + testImplementation "org.embulk:embulk-deps-buffer:0.9.23" + testImplementation "org.embulk:embulk-deps-config:0.9.23" +} + +test { + jvmArgs '-Xms4g', '-Xmx4g', '-XX:MaxMetaspaceSize=1g' + maxHeapSize = "4g" } embulkPlugin { From 17803bfa12fa278d7ee44175485bfa33262ba900 Mon Sep 17 00:00:00 2001 From: Civitaspo Date: Fri, 24 Apr 2020 06:51:34 +0900 Subject: [PATCH 2/6] Upgrade the Gradle Plugin: coveralls-gradle-plugin to 2.10.1 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 107de88..b50f1c1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id "com.github.kt3k.coveralls" version "2.4.0" + id "com.github.kt3k.coveralls" version "2.10.1" id "jacoco" id "java" id "checkstyle" From 045dbd6fc445f79bd4520e35649ef417e12521ba Mon Sep 17 00:00:00 2001 From: Civitaspo Date: Fri, 24 Apr 2020 06:56:30 +0900 Subject: [PATCH 3/6] Setup Github Actions --- .github/workflows/release.yml | 36 +++++++++++++++++++++++++++++++++++ .github/workflows/test.yml | 25 ++++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 .github/workflows/release.yml create mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..4b263d1 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,36 @@ +name: Release CI + +on: + push: + tags: + - '*' + +jobs: + release: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Run tests + run: ./gradlew test + - name: Coveralls Test Report + run: ./gradlew jacocoTestReport coveralls + env: + COVERALLS_REPO_TOKEN: ${{secrets.COVERALLS_REPO_TOKEN}} + CI_NAME: Github Actions + CI_BRANCH: ${{github.ref}} + CI_PULL_REQUEST: ${{github.event.pull_request.html_url}} + - name: Release the new gem + run: | + mkdir -p $HOME/.gem + touch $HOME/.gem/credentials + chmod 0600 $HOME/.gem/credentials + printf -- "---\n:rubygems_api_key: ${RUBYGEMS_API_KEY}\n" > $HOME/.gem/credentials + ./gradlew gemPush + env: + RUBYGEMS_API_KEY: ${{secrets.RUBYGEMS_API_KEY}} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..d58e96a --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,25 @@ +name: Test CI + +on: + - push + +jobs: + test: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Run tests + run: ./gradlew test + - name: Coveralls Test Report + run: ./gradlew jacocoTestReport coveralls + env: + COVERALLS_REPO_TOKEN: ${{secrets.COVERALLS_REPO_TOKEN}} + CI_NAME: Github Actions + CI_BRANCH: ${{github.ref}} + CI_PULL_REQUEST: ${{github.event.pull_request.html_url}} From b33476e2be074f6cc2067236affbe7647809ebf8 Mon Sep 17 00:00:00 2001 From: Civitaspo Date: Fri, 24 Apr 2020 06:56:59 +0900 Subject: [PATCH 4/6] Do not use Travis CI anymore --- .travis.yml | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 22836c8..0000000 --- a/.travis.yml +++ /dev/null @@ -1,12 +0,0 @@ -dist: precise -language: java -jdk: - - openjdk8 -script: - - ./gradlew test -after_success: - - ./gradlew jacocoTestReport coveralls -addons: - hosts: - - me - hostname: me From dfad9ec5b81c3233d9b7ba8a1dde666845ab689f Mon Sep 17 00:00:00 2001 From: Civitaspo Date: Fri, 24 Apr 2020 06:57:21 +0900 Subject: [PATCH 5/6] Add FUNDING.yml --- .github/FUNDING.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..0b8e4cf --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +github: civitaspo From fec59c6d6df458d7bc3d9fdee234e61c5c5e3259 Mon Sep 17 00:00:00 2001 From: Civitaspo Date: Fri, 24 Apr 2020 07:02:25 +0900 Subject: [PATCH 6/6] Change CI status badges --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 91dbb50..529febe 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Expand Json filter plugin for Embulk -[![Build Status](https://travis-ci.org/civitaspo/embulk-filter-expand_json.svg)](https://travis-ci.org/civitaspo/embulk-filter-expand_json) +![Release CI Status Badge](https://github.com/civitaspo/embulk-filter-expand_json/workflows/Release%20CI/badge.svg) ![Test CI Status Badge](https://github.com/civitaspo/embulk-filter-expand_json/workflows/Test%20CI/badge.svg) [![Coverage Status](https://coveralls.io/repos/civitaspo/embulk-filter-expand_json/badge.svg?branch=master&service=github)](https://coveralls.io/github/civitaspo/embulk-filter-expand_json?branch=master) expand columns having json into multiple columns