From 6e9aa3b4bdba9f214283e3d8573a49903379a83b Mon Sep 17 00:00:00 2001 From: Aleksandr Tolstikhin Date: Sat, 7 Dec 2024 01:57:57 +0700 Subject: [PATCH] Upd ymls --- .gitea/workflows/job_lint.yml | 2 +- .gitea/workflows/job_test.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/job_lint.yml b/.gitea/workflows/job_lint.yml index ffaaeb5b..19f6107e 100644 --- a/.gitea/workflows/job_lint.yml +++ b/.gitea/workflows/job_lint.yml @@ -10,7 +10,7 @@ on: jobs: if_merged: - if: github.event.pull_request.merged == true + if: ${{ github.event.pull_request.state != 'closed' || github.event.pull_request.merged == true }} runs-on: ubuntu-latest steps: - name: setup-go diff --git a/.gitea/workflows/job_test.yml b/.gitea/workflows/job_test.yml index 5a21158c..f01c405b 100644 --- a/.gitea/workflows/job_test.yml +++ b/.gitea/workflows/job_test.yml @@ -1,21 +1,21 @@ name: test on: + pull_request: + types: [opened, reopened, closed, synchronize] + branches: + - master + - v3 + - v4 push: branches: - master - v3 - v4 - pull_request: - types: [opened, reopened, closed] - branches: - - master - - v3 - - v4 jobs: - test: - name: test + if_merged: + if: ${{ github.event.pull_request.state != 'closed' || github.event.pull_request.merged == true }} runs-on: ubuntu-latest steps: - name: setup-go