From 3bd0c37177e942bd27a9cecbcffd187197e50746 Mon Sep 17 00:00:00 2001
From: Omar Sandoval <osandov@osandov.com>
Date: Fri, 18 Aug 2023 10:18:04 -0700
Subject: [PATCH] CI: combine Main Branch Push CI back into CI workflow

The CI status badge is inaccurate since commit e9141fa39673 ("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 <osandov@osandov.com>
---
 .github/workflows/ci.yml   |  5 ++++-
 .github/workflows/push.yml | 12 ------------
 2 files changed, 4 insertions(+), 13 deletions(-)
 delete mode 100644 .github/workflows/push.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d4f98595c..955518e7d 100644
--- 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
deleted file mode 100644
index f6ba546c0..000000000
--- a/.github/workflows/push.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: Main Branch Push CI
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  test:
-    uses: ./.github/workflows/ci.yml
-    with:
-      test_all_python_versions: true