From 551eeda96c527be1276fa27e370feaace2d581c6 Mon Sep 17 00:00:00 2001
From: lleyton <lleyton@fyralabs.com>
Date: Sat, 6 May 2023 23:46:48 -0700
Subject: [PATCH] ci: Run actions on merge_group (#423)

* ci: Run actions on merge_group

* fix: update conditional steps

* fix: don't dupe action run for lint

* refactor: simplify condition
---
 .github/workflows/autobuild.yml | 13 ++++++++-----
 .github/workflows/lint.yml      | 12 ++++++++++--
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
index 29ad59173a..9e6d9c365c 100644
--- a/.github/workflows/autobuild.yml
+++ b/.github/workflows/autobuild.yml
@@ -10,6 +10,9 @@ on:
   pull_request:
     branches:
       - f38
+  merge_group:
+    branches:
+      - f38
   workflow_dispatch:
   workflow_call:
 
@@ -51,14 +54,14 @@ jobs:
           fetch-depth: 0
 
       - uses: terrapkg/anda-build@main
-        if: github.event_name == 'pull_request'
+        if: github.event_name != 'push'
         with:
           name: "${{ matrix.pkg.pkg }}"
           mockConfig: anda-${{ matrix.version }}-${{ matrix.pkg.arch }}
           andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo
 
       - uses: terrapkg/anda-build@main
-        if: github.event_name != 'pull_request'
+        if: github.event_name == 'push'
         with:
           name: "${{ matrix.pkg.pkg }}"
           mockConfig: anda-${{ matrix.version }}-${{ matrix.pkg.arch }}
@@ -78,7 +81,7 @@ jobs:
           path: anda-build/rpm/rpms/*
 
       - name: Upload packages to subatomic
-        if: github.event_name != 'pull_request'
+        if: github.event_name == 'push'
         run: |
           subatomic-cli upload --prune \
             --server https://subatomic.fyralabs.com \
@@ -86,8 +89,8 @@ jobs:
             terra${{ matrix.version }} anda-build/rpm/rpms/*
 
       - name: Notify Madoguchi (Success)
-        if: success() && github.event_name != 'pull_request'
+        if: success() && github.event_name == 'push'
         run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
       - name: Notify Madoguchi (Failure)
-        if: ( cancelled() || failure() ) && github.event_name != 'pull_request'
+        if: ( cancelled() || failure() ) && github.event_name == 'push'
         run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 3720348bb3..2a453e7254 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,7 +1,15 @@
 name: Lint
 
-on: [push, pull_request]
-
+on:
+  push:
+    branches:
+      - f38
+  pull_request:
+    branches:
+      - f38
+  merge_group:
+    branches:
+      - f38
 jobs:
   lint:
     runs-on: ubuntu-latest