From 1ac29c7a5431c5cf43fe22a7d56f751b3228da8b Mon Sep 17 00:00:00 2001 From: Alexander Heimbuch Date: Mon, 23 Jan 2023 19:33:21 +0100 Subject: [PATCH] ci: consolidate github workflows --- .github/workflows/push.yml | 51 ------------------------------------ .github/workflows/review.yml | 4 ++- 2 files changed, 3 insertions(+), 52 deletions(-) delete mode 100644 .github/workflows/push.yml diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml deleted file mode 100644 index ff85c5f..0000000 --- a/.github/workflows/push.yml +++ /dev/null @@ -1,51 +0,0 @@ -on: - push: - branches: [ master ] - -concurrency: - group: ${{ github.ref }} - cancel-in-progress: true - -jobs: - push: - name: Push - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Install Node.js - uses: actions/setup-node@v3 - with: - node-version: 18 - - - uses: pnpm/action-setup@v2 - name: Install pnpm - id: pnpm-install - with: - version: 7 - run_install: false - - - name: Get pnpm store directory - id: pnpm-cache - shell: bash - run: | - echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT - - - uses: actions/cache@v3 - name: Setup pnpm cache - with: - path: ${{ steps.pnpm-cache.outputs.STORE_PATH }} - key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}-pnpm-store- - - - name: Install dependencies - run: pnpm install - - - name: Tests - run: pnpm test - - - name: Coverage - uses: codecov/codecov-action@v3 \ No newline at end of file diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml index be72073..af5552f 100644 --- a/.github/workflows/review.yml +++ b/.github/workflows/review.yml @@ -1,5 +1,7 @@ on: - - pull_request + pull_request: + push: + branches: [ master ] concurrency: group: ${{ github.ref }}