diff --git a/.ci/deploy-docs.sh b/.ci/deploy-docs.sh index a8a852331..2209bf7b7 100755 --- a/.ci/deploy-docs.sh +++ b/.ci/deploy-docs.sh @@ -3,11 +3,6 @@ set -x set -o errexit -o nounset -if test "x$TRAVIS_SECURE_ENV_VARS" != xtrue; then exit; fi - -BRANCH="$TRAVIS_BRANCH" -if test "x$BRANCH" != xmaster; then exit; fi - TAG="$(git describe --exact-match --match "[0-9]*" HEAD 2>/dev/null || true)" DOCSDIR=build-docs @@ -17,8 +12,8 @@ rm -rf $DOCSDIR || exit mkdir $DOCSDIR cd $DOCSDIR -cp ../docs/html/* . -#cp ../docs/CNAME . +cp ../build/docs/html/* . +#cp ../build/docs/CNAME . git init git config user.name "Travis CI" diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml index d5076ffda..115e509b5 100644 --- a/.github/workflows/linux-ci.yml +++ b/.github/workflows/linux-ci.yml @@ -20,6 +20,16 @@ jobs: run: meson build -Db_coverage=true -Dglib=enabled -Dcairo=enabled -Dicu=enabled -Dgraphite=enabled -Dfreetype=enabled - name: ci run: meson test --print-errorlogs -Cbuild + + - name: generate documentations + run: ninja -Cbuild harfbuzz-doc + - name: deploy documentations + if: github.event_name == 'push' && github.ref == 'refs/heads/master' + run: .ci/deploy-docs.sh + env: + GH_TOKEN: ${{ secrets.GH_TOKEN }} + REVISION: ${{ github.sha }} + - name: cov run: ninja -Cbuild coverage - uses: codecov/codecov-action@v1 diff --git a/.travis.yml b/.travis.yml index 4aaa99c78..32f1de573 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,6 @@ matrix: - rm -rf freetype-2.9 after_success: - bash .ci/run-coveralls.sh # coveralls.io code coverage - - bash .ci/deploy-docs.sh notifications: irc: "irc.freenode.org#harfbuzz"