[llvm-branch-commits] [llvm] workflows/premerge: Enable macos builds (PR #125176)

[Tom Stellard via llvm-branch-commits]

https://github.com/tstellar updated https://github.com/llvm/llvm-project/pull/125176

>From 713b5e7ea877db545526f88c0513c5f462dba62d Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Thu, 30 Jan 2025 22:31:24 -0800
Subject: [PATCH 1/4] workflows/premerge: Enable macos builds

We still have buildkite for testing Linux and Windows, so we don't need
to enable those builds yet.
---
 .github/workflows/premerge.yaml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index d7fa6718821861..49ffcc0c7ddd24 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -5,8 +5,6 @@ permissions:
 
 on:
   pull_request:
-    paths:
-      - .github/workflows/premerge.yaml
   push:
     branches:
       - 'main'
@@ -14,7 +12,7 @@ on:
 
 jobs:
   premerge-checks-linux:
-    if: github.repository_owner == 'llvm'
+    if: false && github.repository_owner == 'llvm'
     runs-on: llvm-premerge-linux-runners
     concurrency:
       group: ${{ github.workflow }}-linux-${{ github.event.pull_request.number || github.sha }}
@@ -73,7 +71,7 @@ jobs:
           ./.ci/monolithic-linux.sh "$(echo ${linux_projects} | tr ' ' ';')" "$(echo ${linux_check_targets})" "$(echo ${linux_runtimes} | tr ' ' ';')" "$(echo ${linux_runtime_check_targets})"
 
   premerge-checks-windows:
-    if: github.repository_owner == 'llvm'
+    if: false && github.repository_owner == 'llvm'
     runs-on: llvm-premerge-windows-runners
     concurrency:
       group: ${{ github.workflow }}-windows-${{ github.event.pull_request.number || github.sha }}

>From 46644468468461885ffd8be86e831a81e71d3e79 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Fri, 31 Jan 2025 06:49:38 -0800
Subject: [PATCH 2/4] XXX :DEBUG

---
 .github/workflows/premerge.yaml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index 49ffcc0c7ddd24..f0da0d8850de3c 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -136,9 +136,8 @@ jobs:
     concurrency:
       group: ${{ github.workflow }}-macos-${{ github.event.pull_request.number || github.sha }}
       cancel-in-progress: true
-    if: >-
-      (startswith(github.ref_name, 'release/') ||
-       startswith(github.base_ref, 'refs/heads/release/'))
+    if: >- 
+      github.repository_owner == 'llvm'
     steps:
       - name: Checkout LLVM
         uses: actions/checkout at v4
@@ -152,6 +151,8 @@ jobs:
         uses: llvm/actions/install-ninja at main
       - name: Build and Test
         run: |
+          echo $GITHUB_REF_NAME
+          echo $GITHUB_BASE_REF
           modified_files=$(git diff --name-only HEAD~1...HEAD)
           modified_dirs=$(echo "$modified_files" | cut -d'/' -f1 | sort -u)
 

>From 6b348da698e71388dabe61b9650eb4ad24dca56e Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Fri, 31 Jan 2025 06:57:58 -0800
Subject: [PATCH 3/4] Fix condition

---
 .github/workflows/premerge.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index f0da0d8850de3c..eefb6ba2208bb1 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -136,8 +136,10 @@ jobs:
     concurrency:
       group: ${{ github.workflow }}-macos-${{ github.event.pull_request.number || github.sha }}
       cancel-in-progress: true
-    if: >- 
-      github.repository_owner == 'llvm'
+    if: >-
+      github.repository_owner == 'llvm' &&
+      (startswith(github.ref_name, 'release/') ||
+       startswith(github.base_ref, 'release/'))
     steps:
       - name: Checkout LLVM
         uses: actions/checkout at v4

>From 09b3e0e49ce17a9267b794ec74f50e60340fc382 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Fri, 31 Jan 2025 14:00:33 -0800
Subject: [PATCH 4/4] Update premerge.yaml

---
 .github/workflows/premerge.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index eefb6ba2208bb1..c22b35e122b9fc 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -153,8 +153,6 @@ jobs:
         uses: llvm/actions/install-ninja at main
       - name: Build and Test
         run: |
-          echo $GITHUB_REF_NAME
-          echo $GITHUB_BASE_REF
           modified_files=$(git diff --name-only HEAD~1...HEAD)
           modified_dirs=$(echo "$modified_files" | cut -d'/' -f1 | sort -u)