From 7a4ea349f0bdddd8a6731e85f71350b5ff4390cf Mon Sep 17 00:00:00 2001 From: NEKOYASAN Date: Sat, 6 Jan 2024 18:20:41 +0900 Subject: [PATCH 1/3] =?UTF-8?q?Workflow=E3=81=AEtrigger=E3=82=92=E5=A4=89?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/e2e.yml | 6 +++++- .github/workflows/generate-pages.yml | 3 ++- .github/workflows/gh-pages.yml | 1 + .github/workflows/lint.yml | 6 +++++- .github/workflows/test.yml | 6 +++++- 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 8a76ae37..bff35199 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -1,6 +1,10 @@ # see https://playwright.dev/docs/ci-intro name: e2e -on: push +on: + push: + branches: + - master + pull_request_target: jobs: test: diff --git a/.github/workflows/generate-pages.yml b/.github/workflows/generate-pages.yml index 16ca60cc..47630f0e 100644 --- a/.github/workflows/generate-pages.yml +++ b/.github/workflows/generate-pages.yml @@ -1,6 +1,7 @@ name: generate pages -on: push +on: + pull_request_target: jobs: generate-pages: diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index b637bd1a..1fa07ceb 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -4,6 +4,7 @@ on: push: branches: - master + workflow_dispatch: jobs: build-deploy: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 52faaceb..1b7bc1e6 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,5 +1,9 @@ name: lint -on: push +on: + push: + branches: + - master + pull_request_target: jobs: eslint: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7c60b858..8876077e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,5 +1,9 @@ name: test -on: push +on: + push: + branches: + - master + pull_request_target: jobs: test: From ddc97e393bb11ee3a36a7a83dc3cf1731f42e68e Mon Sep 17 00:00:00 2001 From: NEKOYASAN Date: Sat, 6 Jan 2024 18:21:01 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E3=82=BF=E3=82=A4=E3=83=A0=E3=82=A2?= =?UTF-8?q?=E3=82=A6=E3=83=88=E3=82=92=E8=A8=98=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/e2e.yml | 2 +- .github/workflows/generate-pages.yml | 1 + .github/workflows/gh-pages.yml | 1 + .github/workflows/lint.yml | 1 + .github/workflows/test.yml | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index bff35199..f655e9ab 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -8,7 +8,7 @@ on: jobs: test: - timeout-minutes: 60 + timeout-minutes: 10 runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/generate-pages.yml b/.github/workflows/generate-pages.yml index 47630f0e..d03dc70f 100644 --- a/.github/workflows/generate-pages.yml +++ b/.github/workflows/generate-pages.yml @@ -5,6 +5,7 @@ on: jobs: generate-pages: + timeout-minutes: 10 runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 1fa07ceb..86210521 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -8,6 +8,7 @@ on: jobs: build-deploy: + timeout-minutes: 10 runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 1b7bc1e6..3a7d04fb 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -7,6 +7,7 @@ on: jobs: eslint: + timeout-minutes: 10 runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8876077e..cb5c8116 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,6 +7,7 @@ on: jobs: test: + timeout-minutes: 10 runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 From 1c0abe2b9ab0e2bc27d12a90cc13e46c1b39be27 Mon Sep 17 00:00:00 2001 From: NEKOYASAN Date: Sat, 6 Jan 2024 18:21:18 +0900 Subject: [PATCH 3/3] =?UTF-8?q?node=20version=E3=82=92.node-version?= =?UTF-8?q?=E3=81=8B=E3=82=89=E5=8F=96=E5=BE=97=E3=81=99=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/generate-pages.yml | 2 +- .github/workflows/gh-pages.yml | 2 +- .github/workflows/lint.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/generate-pages.yml b/.github/workflows/generate-pages.yml index d03dc70f..c84d325d 100644 --- a/.github/workflows/generate-pages.yml +++ b/.github/workflows/generate-pages.yml @@ -13,7 +13,7 @@ jobs: - name: setup node uses: actions/setup-node@v4 with: - node-version: '20.10.0' + node-version-file: '.node-version' - name: Cache dependencies uses: actions/cache@v1 diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 86210521..ecfcd8b1 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -16,7 +16,7 @@ jobs: - name: setup node uses: actions/setup-node@v4 with: - node-version: '20.10.0' + node-version-file: '.node-version' - name: Cache dependencies uses: actions/cache@v1 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 3a7d04fb..1ffd7d8a 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -14,6 +14,6 @@ jobs: - name: setup node uses: actions/setup-node@v4 with: - node-version: '20.10.0' + node-version-file: '.node-version' - run: yarn install - run: yarn run lint