From db04961662827a5bd8ee4f954b9c9f08b6e6e296 Mon Sep 17 00:00:00 2001 From: Tsuyoshi CHO Date: Thu, 16 Dec 2021 20:35:51 +0900 Subject: [PATCH 1/2] ci: fix mutex and pull strategy (see #918) --- .github/workflows/generate.yml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/generate.yml b/.github/workflows/generate.yml index 5f743f2a0..f99d9c986 100644 --- a/.github/workflows/generate.yml +++ b/.github/workflows/generate.yml @@ -30,10 +30,6 @@ jobs: vim -eu tools/maketags.vim cd .. - - name: Lock mutex - uses: shogo82148/actions-mutex@v1 - with: - key: ${{ github.job }} - name: Update target run: | cd target @@ -56,10 +52,14 @@ jobs: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }} branch: master - pull_strategy: 'NO-PULL' + pull: 'NO-PULL' deploy: runs-on: ubuntu-latest + needs: generate + # "deploy" update vimdoc-ja/gh-pages branch + # work after "generate" to updated vimdoc-ja/master branch + # parallel work conflict vimdoc-ja repo status steps: - name: checkout master uses: actions/checkout@v2 @@ -84,10 +84,6 @@ jobs: make html cd .. - - name: Lock mutex - uses: shogo82148/actions-mutex@v1 - with: - key: ${{ github.job }} - name: Update target run: | cd target @@ -108,4 +104,4 @@ jobs: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }} branch: gh-pages - pull_strategy: 'NO-PULL' + pull: 'NO-PULL' From 1042608c1fff441f0823e912ad333ca36532e240 Mon Sep 17 00:00:00 2001 From: Tsuyoshi CHO Date: Tue, 21 Dec 2021 22:22:41 +0900 Subject: [PATCH 2/2] ci: add concurrency limit --- .github/workflows/generate.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/generate.yml b/.github/workflows/generate.yml index f99d9c986..e12dce62c 100644 --- a/.github/workflows/generate.yml +++ b/.github/workflows/generate.yml @@ -4,6 +4,9 @@ on: branches: - master +concurrency: vimdoc-ja-deploy + # global concurrency limit access to vim-jp/vimdoc-ja per workflow + jobs: generate: runs-on: ubuntu-latest