CI: combine Main Branch Push CI back into CI workflow

The CI status badge is inaccurate since commit e9141fa ("ci: reduce usage and add Python 3.12 beta") because the "real" CI on the main branch got moved to a new workflow and the existing one became a reusable workflow_call/workflow_dispatch. Combine the push workflow back into the reusable workflow. Signed-off-by: Omar Sandoval <[email protected]>
osandov · Aug 18, 2023 · 3bd0c37 · 3bd0c37
1 parent f4af9b5
commit 3bd0c37
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,6 +1,9 @@
 name: CI
 
 on:
+  push:
+    branches:
+      - main
   workflow_dispatch:
     inputs:
       test_all_python_versions:
@@ -27,7 +30,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: ${{ inputs.test_all_python_versions
+        python-version: ${{ (github.event_name == 'push' || inputs.test_all_python_versions)
                             && fromJSON('["3.12", "3.11", "3.10", "3.9", "3.8", "3.7", "3.6"]')
                             || fromJSON('["3.11", "3.6"]')}}
         cc: [gcc, clang]

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml