From 7a01ecb53c700dff7293779eba3bbeb70b3d9918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=BE=E3=81=A3=E3=81=A1=E3=82=83=E3=81=A8=E3=83=BC?= =?UTF-8?q?=E3=81=AB=E3=82=85?= <17376330+u1-liquid@users.noreply.github.com> Date: Wed, 20 Mar 2024 21:15:37 +0900 Subject: [PATCH] =?UTF-8?q?fix(ci):=20GitHub=20Actions=20workflow=E3=81=AE?= =?UTF-8?q?=E6=95=B4=E5=82=99=20(MisskeyIO#550)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/check-misskey-js-version.yml | 5 ++++- .github/workflows/check_copyright_year.yml | 18 ------------------ .github/workflows/docker-host.yml | 2 +- .github/workflows/docker-io.yml | 2 +- .github/workflows/dockle.yml | 5 +++-- .github/workflows/lint.yml | 2 ++ .github/workflows/test-backend.yml | 2 ++ .github/workflows/test-frontend.yml | 2 ++ .github/workflows/test-misskey-js.yml | 5 ++++- .github/workflows/test-production.yml | 5 +++-- .github/workflows/validate-api-json.yml | 2 ++ 11 files changed, 24 insertions(+), 26 deletions(-) delete mode 100644 .github/workflows/check_copyright_year.yml diff --git a/.github/workflows/check-misskey-js-version.yml b/.github/workflows/check-misskey-js-version.yml index 0102dbc815..676585e974 100644 --- a/.github/workflows/check-misskey-js-version.yml +++ b/.github/workflows/check-misskey-js-version.yml @@ -2,7 +2,10 @@ name: Check Misskey JS version on: push: - branches: [ io ] + branches: + - beta + - io + - host paths: - packages/misskey-js/package.json - package.json diff --git a/.github/workflows/check_copyright_year.yml b/.github/workflows/check_copyright_year.yml deleted file mode 100644 index 03dfcd0a0b..0000000000 --- a/.github/workflows/check_copyright_year.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Check copyright year - -on: - push: - branches: - - master - - develop - -jobs: - check_copyright_year: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4.1.1 - - run: | - if [ "$(grep Copyright COPYING | sed -e 's/.*2014-\([0-9]*\) .*/\1/g')" -ne "$(date +%Y)" ]; then - echo "Please change copyright year!" - exit 1 - fi diff --git a/.github/workflows/docker-host.yml b/.github/workflows/docker-host.yml index 40ac20b585..5400680721 100644 --- a/.github/workflows/docker-host.yml +++ b/.github/workflows/docker-host.yml @@ -5,7 +5,7 @@ on: branches: - host tags: - - '[0-9.]+-host.*' + - '**-host.*' workflow_dispatch: jobs: diff --git a/.github/workflows/docker-io.yml b/.github/workflows/docker-io.yml index 4a2d038ea0..7576a1ce67 100644 --- a/.github/workflows/docker-io.yml +++ b/.github/workflows/docker-io.yml @@ -5,7 +5,7 @@ on: branches: - io tags: - - '[0-9.]+-io.*' + - '**-io.*' workflow_dispatch: jobs: diff --git a/.github/workflows/dockle.yml b/.github/workflows/dockle.yml index d9366d8f34..859f20b916 100644 --- a/.github/workflows/dockle.yml +++ b/.github/workflows/dockle.yml @@ -3,8 +3,9 @@ name: Dockle on: push: branches: - - master - - develop + - beta + - io + - host pull_request: jobs: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index dc08020df8..c872b15e91 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -3,7 +3,9 @@ name: Lint on: push: branches: + - beta - io + - host paths: - packages/backend/** - packages/frontend/** diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml index 32c85b9d89..fbb46c818a 100644 --- a/.github/workflows/test-backend.yml +++ b/.github/workflows/test-backend.yml @@ -3,7 +3,9 @@ name: Test (backend) on: push: branches: + - beta - io + - host paths: - packages/backend/** # for permissions diff --git a/.github/workflows/test-frontend.yml b/.github/workflows/test-frontend.yml index 3a9b1082d5..cace38efab 100644 --- a/.github/workflows/test-frontend.yml +++ b/.github/workflows/test-frontend.yml @@ -3,7 +3,9 @@ name: Test (frontend) on: push: branches: + - beta - io + - host paths: - packages/frontend/** # for permissions diff --git a/.github/workflows/test-misskey-js.yml b/.github/workflows/test-misskey-js.yml index bc88994a07..85af292f91 100644 --- a/.github/workflows/test-misskey-js.yml +++ b/.github/workflows/test-misskey-js.yml @@ -5,7 +5,10 @@ name: Test (misskey.js) on: push: - branches: [ io ] + branches: + - beta + - io + - host paths: - packages/misskey-js/** pull_request: diff --git a/.github/workflows/test-production.yml b/.github/workflows/test-production.yml index 9b63117fcc..b30a3d67b2 100644 --- a/.github/workflows/test-production.yml +++ b/.github/workflows/test-production.yml @@ -3,8 +3,9 @@ name: Test (production install and build) on: push: branches: - - master - - develop + - beta + - io + - host pull_request: env: diff --git a/.github/workflows/validate-api-json.yml b/.github/workflows/validate-api-json.yml index 90886abc3d..2f0fbb433c 100644 --- a/.github/workflows/validate-api-json.yml +++ b/.github/workflows/validate-api-json.yml @@ -3,7 +3,9 @@ name: Test (backend) on: push: branches: + - beta - io + - host paths: - packages/backend/** pull_request: