From 65b37b7ef4828eb18b142de6278eeffc2cef6859 Mon Sep 17 00:00:00 2001 From: Sebastian Martinez Date: Fri, 16 Dec 2022 16:14:54 +0100 Subject: [PATCH] Updates some CI packages to v3 and skips test if PR is merged Signed-off-by: Sebastian Martinez --- .github/workflows/check-build.yml | 1 + .github/workflows/check-e2e.yml | 1 + .github/workflows/check-format.yml | 3 ++- .github/workflows/check-unit-test.yml | 3 ++- .github/workflows/check.yml | 3 ++- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check-build.yml b/.github/workflows/check-build.yml index d3a598635..6605f6c3b 100644 --- a/.github/workflows/check-build.yml +++ b/.github/workflows/check-build.yml @@ -9,6 +9,7 @@ on: jobs: check-build: + if: github.event.pull_request.merged == false timeout-minutes: 30 runs-on: ubuntu-latest steps: diff --git a/.github/workflows/check-e2e.yml b/.github/workflows/check-e2e.yml index a63327b4b..47c70c3bb 100644 --- a/.github/workflows/check-e2e.yml +++ b/.github/workflows/check-e2e.yml @@ -9,6 +9,7 @@ on: jobs: check-e2e: + if: github.event.pull_request.merged == false continue-on-error: true strategy: matrix: diff --git a/.github/workflows/check-format.yml b/.github/workflows/check-format.yml index ca7fd8fd8..bab23a051 100644 --- a/.github/workflows/check-format.yml +++ b/.github/workflows/check-format.yml @@ -9,13 +9,14 @@ on: jobs: check-format: + if: github.event.pull_request.merged == false runs-on: ubuntu-latest steps: - name: Setup Node uses: actions/setup-node@v3 with: node-version: "18.12.1" - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - run: npm ci - run: ./scripts/check-format shell: bash diff --git a/.github/workflows/check-unit-test.yml b/.github/workflows/check-unit-test.yml index 2704c04ca..154e707b4 100644 --- a/.github/workflows/check-unit-test.yml +++ b/.github/workflows/check-unit-test.yml @@ -9,6 +9,7 @@ on: jobs: check-unit-test: + if: github.event.pull_request.merged == false runs-on: ubuntu-latest steps: - name: Setup Node @@ -16,6 +17,6 @@ jobs: with: node-version: "18.12.1" - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - run: npm ci - run: npm run test:unit diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 1182115a9..4d36f7d25 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -9,12 +9,13 @@ on: jobs: check: + if: github.event.pull_request.merged == false runs-on: ubuntu-latest steps: - name: Setup Node uses: actions/setup-node@v3 with: node-version: "18.12.1" - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - run: npm ci - run: npm run check