From bec20eb1d888bc4c322819064f74b74c3466d159 Mon Sep 17 00:00:00 2001 From: Tsuyoshi CHO Date: Fri, 16 Apr 2021 20:31:07 +0900 Subject: [PATCH 1/4] ci: renrew to use GitHub workflow --- .github/workflows/generate.yml | 46 ++++++++++++++++++++++++++++++ .travis.yml | 18 ------------ tools/ci@vimdoc-en.vim-jp.org.enc | Bin 3248 -> 0 bytes tools/deploy-gh-pages.sh | 25 ---------------- tools/install_sshkey_github.sh | 14 --------- 5 files changed, 46 insertions(+), 57 deletions(-) create mode 100644 .github/workflows/generate.yml delete mode 100644 .travis.yml delete mode 100644 tools/ci@vimdoc-en.vim-jp.org.enc delete mode 100755 tools/deploy-gh-pages.sh delete mode 100755 tools/install_sshkey_github.sh diff --git a/.github/workflows/generate.yml b/.github/workflows/generate.yml new file mode 100644 index 00000000..218cfb82 --- /dev/null +++ b/.github/workflows/generate.yml @@ -0,0 +1,46 @@ +name: Generate vim help +on: + push: + branches: + - master + workflow_dispatch: + schedule: + - cron: '36 20 * * Sat' + +jobs: + deploy: + runs-on: ubuntu-latest + steps: + - name: checkout master + uses: actions/checkout@v2 + with: + path: work + - name: Checkout gh-pages + uses: actions/checkout@v2 + with: + path: target + ref: gh-pages + - name: Setup Vim + uses: thinca/action-setup-vim@v1 + with: + vim_version: 'v8.2.0020' + vim_type: 'Vim' + - name: Generate new document + run: | + cd work + # Create tags + make html + + cd .. + # install + cp work/target/html/doc/*.html target + - name: Commit updated master branch + uses: EndBug/add-and-commit@v7 + with: + cwd: './target' + author_name: '${{ github.actor }}' + author_email: '${{ github.actor }}@users.noreply.github.com' + message: 'Generated by GitHub workflow ${{ github.run_id }}' + branch: gh-pages + env: + GITHUB_TOKEN: ${{ secrets.VIMDOC_JP_TOKEN }} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 62285547..00000000 --- a/.travis.yml +++ /dev/null @@ -1,18 +0,0 @@ -language: go -go: 1.7.3 -dist: trusty -sudo: false - -env: - global: - - 'DEPLOY_BRANCH="master"' - - 'DEPLOY_REPO_SLUG="vim-jp/vimdoc-en"' - - 'DEPLOY_USER_NAME="vimdoc-en on travis-ci"' - - 'DEPLOY_USER_EMAIL="vimdoc-en+travis-ci@vim-jp.org"' - -script: - - sh ./tools/install_sshkey_github.sh $encrypted_3ac247a44cc5_key $encrypted_3ac247a44cc5_iv ./tools/ci@vimdoc-en.vim-jp.org.enc ~/.ssh/ci@vimdoc-en.vim-jp.org - - | - if [ "$TRAVIS_BRANCH" = "$DEPLOY_BRANCH" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then - sh ./tools/deploy-gh-pages.sh _gh-pages - fi diff --git a/tools/ci@vimdoc-en.vim-jp.org.enc b/tools/ci@vimdoc-en.vim-jp.org.enc deleted file mode 100644 index cc4f3f6954c76529da6fd7db7fb0d885bde31d0c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3248 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 iRa%> ~/.ssh/config -openssl aes-256-cbc -K "$key" -iv "$iv" -in "$src" -d -out "$dst" -chmod 600 "$dst" From f0e19333ca74cc5f6bd0d6b659dbf6307fac90b1 Mon Sep 17 00:00:00 2001 From: Tsuyoshi CHO Date: Fri, 16 Apr 2021 20:36:13 +0900 Subject: [PATCH 2/4] fix typo --- .github/workflows/generate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate.yml b/.github/workflows/generate.yml index 218cfb82..4c9ceeec 100644 --- a/.github/workflows/generate.yml +++ b/.github/workflows/generate.yml @@ -28,7 +28,7 @@ jobs: - name: Generate new document run: | cd work - # Create tags + # Create html documents make html cd .. From bb452d1ce3d96dc7933f7016695cecb27033d160 Mon Sep 17 00:00:00 2001 From: Tsuyoshi CHO Date: Sat, 17 Apr 2021 12:13:22 +0900 Subject: [PATCH 3/4] ci: commit message update --- .github/workflows/generate.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/generate.yml b/.github/workflows/generate.yml index 4c9ceeec..756eae8b 100644 --- a/.github/workflows/generate.yml +++ b/.github/workflows/generate.yml @@ -40,7 +40,9 @@ jobs: cwd: './target' author_name: '${{ github.actor }}' author_email: '${{ github.actor }}@users.noreply.github.com' - message: 'Generated by GitHub workflow ${{ github.run_id }}' + message: |- + Generated by GitHub workflow ${{ github.run_id }} + https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }} branch: gh-pages env: GITHUB_TOKEN: ${{ secrets.VIMDOC_JP_TOKEN }} From 57a9376de0d6c367ad6c05e8f9c671779c778476 Mon Sep 17 00:00:00 2001 From: Tsuyoshi CHO Date: Thu, 22 Apr 2021 07:06:10 +0900 Subject: [PATCH 4/4] review fixup --- .github/workflows/generate.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/generate.yml b/.github/workflows/generate.yml index 756eae8b..241eb519 100644 --- a/.github/workflows/generate.yml +++ b/.github/workflows/generate.yml @@ -5,7 +5,7 @@ on: - master workflow_dispatch: schedule: - - cron: '36 20 * * Sat' + - cron: '5 12 * * *' jobs: deploy: @@ -42,6 +42,7 @@ jobs: author_email: '${{ github.actor }}@users.noreply.github.com' message: |- Generated by GitHub workflow ${{ github.run_id }} + https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }} branch: gh-pages env: