chore: combine merge and pullrequest workflows

Signed-off-by: Federico Bond <federicobond@gmail.com>
open-feature · Oct 22, 2023 · a7ead47 · a7ead47
1 parent 2a62fc7
commit a7ead47
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 81 deletions.
diff --git a/.github/workflows/pullrequest.yml → .github/workflows/build-test.yml b/.github/workflows/pullrequest.yml → .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