From a7ead47e10fc060f0d577861ae9848bc4ba70f7c Mon Sep 17 00:00:00 2001
From: Federico Bond <federicobond@gmail.com>
Date: Sat, 21 Oct 2023 22:07:56 -0300
Subject: [PATCH] chore: combine merge and pullrequest workflows

Signed-off-by: Federico Bond <federicobond@gmail.com>
---
 .../{pullrequest.yml => build-test.yml}       |  8 +-
 .github/workflows/merge.yml                   | 77 -------------------
 2 files changed, 4 insertions(+), 81 deletions(-)
 rename .github/workflows/{pullrequest.yml => build-test.yml} (97%)
 delete mode 100644 .github/workflows/merge.yml

diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/build-test.yml
similarity index 97%
rename from .github/workflows/pullrequest.yml
rename to .github/workflows/build-test.yml
index 485743d6..60891ea9 100644
--- a/.github/workflows/pullrequest.yml
+++ b/.github/workflows/build-test.yml
@@ -3,15 +3,14 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 
-name: PR
+name: "Build / Test"
 
 on:
+  push:
+    branches: [master, main]
   pull_request:
     branches: [master, main]
 
-permissions:
-  contents: read
-
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -51,6 +50,7 @@ jobs:
 
   lint:
     runs-on: ubuntu-latest
+
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
deleted file mode 100644
index 8dc3416c..00000000
--- a/.github/workflows/merge.yml
+++ /dev/null
@@ -1,77 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
-name: Merge
-
-on:
-  push:
-    branches: [master, main]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache: "pip"
-
-      - name: Install dependencies
-        run: pip install -r requirements.txt
-
-      - name: Test with pytest
-        run: coverage run --omit="*/test*" -m pytest
-
-      - name: Run E2E tests with behave
-        run: |
-          cp test-harness/features/evaluation.feature tests/features/
-          behave tests/features/
-
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@c9e0f0b3cf5f112462339d69850c01735114b9ed
-        with:
-          flags: unittests # optional
-          name: coverage # optional
-          fail_ci_if_error: true # optional (default = false)
-          verbose: true # optional (default = false)
-
-  lint:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
-        with:
-          python-version: "3.11"
-          cache: "pip"
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
-        with:
-          languages: python
-
-      - name: Install dependencies
-        run: pip install -r requirements.txt
-
-      - name: Run black formatter check
-        run: black --check .
-
-      - name: Run flake8 formatter check
-        run: flake8 .
-
-      - name: Run isort formatter check
-        run: isort .
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2