diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 028f4ad75..7597e2f4d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - java: [8, 11] + java: [8, 11, 15] fail-fast: false max-parallel: 4 name: Test JDK ${{ matrix.java }}, ${{ matrix.os }} @@ -30,3 +30,30 @@ jobs: - name: Verify with Maven run: mvn -B -P!standard-with-extra-repos verify --fail-at-end -Dsource.skip=true -Dmaven.javadoc.skip=true + + publish: + runs-on: ubuntu-latest + needs: test + if: ${{ github.event_name == 'push' }} + name: Publish Javadoc and Snapshot + + steps: + - uses: actions/checkout@v2 + - name: Setup JDK + uses: actions/setup-java@v1 + with: + java-version: 11 + server-id: google-snapshots + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD + - name: Publish Javadoc + env: + GH_TOKEN: ${{ secrets.GH_TOKEN }} + run: | + chmod +x util/publish-latest-docs.sh + ./util/publish-latest-docs.sh + - name: Publish Snapshot + run: mvn clean deploy -DskipTests=true -Dmaven.javadoc.skip=true + env: + MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 156384ad9..000000000 --- a/.travis.yml +++ /dev/null @@ -1,32 +0,0 @@ -language: java -sudo: false - -cache: - directories: - - $HOME/.m2 - -jdk: - - openjdk15 - - openjdk11 - - openjdk8 - -env: - global: - - secure: "A3i6zmtUzZO/i4+B1BR0DtPNdrCjJceSRuMwqEuqnxVPI/ABWtXqfrjNLRuQDuysVJTyieFUa1D4A0rgn2FZNV7nmPzTebPOC8xZcneQWzOyzWhvndFPme41NtXjSER3qQqI+Zy6ESaErraKZEwoZXM1lOhQANks3hGXAmxAOZw=" # GH_TOKEN - - matrix: - - LABEL=mvn CMD="mvn -B -P!standard-with-extra-repos verify --fail-at-end -Dsource.skip=true -Dmaven.javadoc.skip=true" INSTALL="mvn -P!standard-with-extra-repos dependency:go-offline test clean --quiet --fail-never -DskipTests=true" - -install: - - ${INSTALL} - -script: - - ${CMD} - -after_success: - - util/publish-latest-docs.sh - - util/publish-snapshot-on-commit.sh - -branches: - only: - - master diff --git a/util/publish-latest-docs.sh b/util/publish-latest-docs.sh index 194a7864a..159eed11c 100755 --- a/util/publish-latest-docs.sh +++ b/util/publish-latest-docs.sh @@ -1,24 +1,21 @@ -if [ "$TRAVIS_REPO_SLUG" == "google/guice" ] && \ - [ "$TRAVIS_JDK_VERSION" == "openjdk11" ] && \ - [ "$TRAVIS_PULL_REQUEST" == "false" ] && \ - [ "$TRAVIS_BRANCH" == "master" ]; then - bash -e util/generate-latest-docs.sh - echo -e "Publishing javadoc & JDiff...\n" - mkdir -p $HOME/guice-docs/latest - cp -R build/docs/* $HOME/guice-docs/latest/ +#!/bin/bash - cd $HOME - git config --global user.email "travis@travis-ci.org" - git config --global user.name "travis-ci" - git clone --quiet --branch=gh-pages https://${GH_TOKEN}@github.com/google/guice gh-pages > /dev/null +bash -e util/generate-latest-docs.sh +echo -e "Publishing javadoc & JDiff...\n" +mkdir -p $HOME/guice-docs/latest +cp -R build/docs/* $HOME/guice-docs/latest/ - cd gh-pages - git rm -rf api-docs/latest - mkdir -p api-docs/latest - cp -rf $HOME/guice-docs/latest/* api-docs/latest/ - git add -f . - git commit -m "Latest javadoc & api-diffs on successful travis build $TRAVIS_BUILD_NUMBER auto-pushed to gh-pages" - git push -fq origin gh-pages > /dev/null +cd $HOME +git config --global user.email "guice-dev+github@google.com" +git config --global user.name "guice-dev+github" +git clone --quiet --branch=gh-pages https://${GH_TOKEN}@github.com/google/guice gh-pages > /dev/null - echo -e "Published Javadoc & JDiff to gh-pages.\n" -fi +cd gh-pages +git rm -rf api-docs/latest +mkdir -p api-docs/latest +cp -rf $HOME/guice-docs/latest/* api-docs/latest/ +git add -f . +git commit -m "Latest javadoc & api-diffs on successful CI build $GITHUB_SHA auto-pushed to gh-pages" +git push -fq origin gh-pages > /dev/null + +echo -e "Published Javadoc & JDiff to gh-pages.\n" diff --git a/util/publish-snapshot-on-commit.sh b/util/publish-snapshot-on-commit.sh deleted file mode 100755 index 6168b08cb..000000000 --- a/util/publish-snapshot-on-commit.sh +++ /dev/null @@ -1,16 +0,0 @@ -# see https://coderwall.com/p/9b_lfq - -if [ "$TRAVIS_REPO_SLUG" == "google/guice" ] && \ - [ "$TRAVIS_JDK_VERSION" == "openjdk11" ] && \ - [ "$TRAVIS_PULL_REQUEST" == "false" ] && \ - [ "$TRAVIS_BRANCH" == "master" ]; then - echo -e "Publishing maven snapshot...\n" - - cd $HOME - git clone --quiet --branch=travis https://github.com/google/guice travis > /dev/null - cd - - - mvn clean deploy --settings="$HOME/travis/settings.xml" -DskipTests=true -Dmaven.javadoc.skip=true - - echo -e "Published maven snapshot" -fi