From de1325cc06ae186775447cf446ad98edd09fa0e7 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 27 Jul 2020 03:40:15 -0700 Subject: [PATCH] Cleanup. --- .circleci/config.yml | 6 +++--- .github/workflows/gradle.yml | 27 ++++++++++----------------- .gitlab-ci.yml | 1 - .travis.yml | 6 +++--- README.md | 2 +- 5 files changed, 17 insertions(+), 25 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d21cbc7..cc73045 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -49,6 +49,6 @@ jobs: workflows: version: 2 gradle: - jobs: - - build_gradle_jdk8 - - build_gradle_jdk14 + jobs: + - build_gradle_jdk8 + - build_gradle_jdk14 diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 8ac9ad2..d9750d9 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -1,25 +1,18 @@ name: Java CI with Gradle -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - workflow_dispatch: - +on: [push, pull_request, workflow_dispatch] jobs: build: - runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 - with: - java-version: 1.8 - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Test with Gradle - run: ./gradlew check + - uses: actions/checkout@v2 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Test with Gradle + run: ./gradlew check diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7c9b125..26820aa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,6 @@ image: gradle:alpine variables: GRADLE_OPTS: "-Dorg.gradle.daemon=false" - CI: "true" before_script: - export GRADLE_USER_HOME=`pwd`/.gradle diff --git a/.travis.yml b/.travis.yml index 48c5805..c2c104c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,6 @@ before_install: after_success: - | - if [ "${TRAVIS_TEST_RESULT}" == 0 ] && [ "$TRAVIS_JDK_VERSION" == "openjdk14" ]; then - ./gradlew sonarqube - fi + if [ "${TRAVIS_TEST_RESULT}" == 0 ] && [ "$TRAVIS_JDK_VERSION" == "openjdk14" ]; then + ./gradlew sonarqube + fi diff --git a/README.md b/README.md index c2d7cb2..7a8d7ce 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ A couple of useful functions are also available: ```kotlin ReadingTime.wordCount(htmlText) // Returns the count of words. (HTML stripped) -ReadingTime.imgCount(htmlText) // Returns the count of images. (img HTML tags) +ReadingTime.imgCount(htmlText) // Returns the count of images. (HTML img tags) ``` ### Gradle