From 1a8e22d813efd749c5467edd7d10073f4d441611 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 21 Aug 2021 14:39:43 +0200
Subject: [PATCH] Rename self-hosted Mac CI workflow file for consistency

Call this file consistently with the other CI files and also ignore all
of the other files in each workflow to avoid unnecessary rebuilds.

Finally, remove a leftover mention of Travis file which doesn't exist
any longer.
---
 .github/workflows/ci.yml                               |  4 ++--
 .github/workflows/ci_cmake.yml                         |  2 ++
 .../{MacS-M1-make.yml => ci_mac_selfhosted.yml}        | 10 +++++++---
 .github/workflows/ci_msw_cross.yml                     |  4 ++++
 4 files changed, 15 insertions(+), 5 deletions(-)
 rename .github/workflows/{MacS-M1-make.yml => ci_mac_selfhosted.yml} (95%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b25dbf588a..6ad5ef60e9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ on:
     branches:
       - master
     paths-ignore:
-      - '.github/workflows/MacS-M1-make.yml'
+      - '.github/workflows/ci_mac_selfhosted.yml'
       - '.github/workflows/ci_cmake.yml'
       - '.github/workflows/ci_msw_cross.yml'
       - 'build/tools/appveyor*.bat'
@@ -24,7 +24,7 @@ on:
     branches:
       - master
     paths-ignore:
-      - '.github/workflows/MacS-M1-make.yml'
+      - '.github/workflows/ci_mac_selfhosted.yml'
       - '.github/workflows/ci_cmake.yml'
       - '.github/workflows/ci_msw_cross.yml'
       - 'build/tools/appveyor*.bat'
diff --git a/.github/workflows/ci_cmake.yml b/.github/workflows/ci_cmake.yml
index 1e3ad23fd0..2a5e599db7 100644
--- a/.github/workflows/ci_cmake.yml
+++ b/.github/workflows/ci_cmake.yml
@@ -7,6 +7,7 @@ on:
       - master
     paths-ignore:
       - '.github/workflows/ci.yml'
+      - '.github/workflows/ci_mac_selfhosted.yml'
       - '.github/workflows/ci_msw_cross.yml'
       - 'build/tools/appveyor*.bat'
       - 'distrib/**'
@@ -24,6 +25,7 @@ on:
       - master
     paths-ignore:
       - '.github/workflows/ci.yml'
+      - '.github/workflows/ci_mac_selfhosted.yml'
       - '.github/workflows/ci_msw_cross.yml'
       - 'build/tools/appveyor*.bat'
       - 'distrib/**'
diff --git a/.github/workflows/MacS-M1-make.yml b/.github/workflows/ci_mac_selfhosted.yml
similarity index 95%
rename from .github/workflows/MacS-M1-make.yml
rename to .github/workflows/ci_mac_selfhosted.yml
index 55d16fe8a3..bb4acfca44 100644
--- a/.github/workflows/MacS-M1-make.yml
+++ b/.github/workflows/ci_mac_selfhosted.yml
@@ -1,12 +1,14 @@
-name: Mac make CI
+name: Mac builds
 
 on:
   workflow_dispatch:
   push:
     branches: [ master ]
     paths-ignore:
+    - '.github/workflows/ci.yml'
+    - '.github/workflows/ci_cmake.yml'
+    - '.github/workflows/ci_msw_cross.yml'
     - 'build/tools/appveyor*.bat'
-    - 'build/tools/travis-ci.sh'
     - 'distrib/**'
     - 'docs/**'
     - 'interface/**'
@@ -30,8 +32,10 @@ on:
   pull_request:
     branches: [ master ]
     paths-ignore:
+    - '.github/workflows/ci.yml'
+    - '.github/workflows/ci_cmake.yml'
+    - '.github/workflows/ci_msw_cross.yml'
     - 'build/tools/appveyor*.bat'
-    - 'build/tools/travis-ci.sh'
     - 'distrib/**'
     - 'docs/**'
     - 'interface/**'
diff --git a/.github/workflows/ci_msw_cross.yml b/.github/workflows/ci_msw_cross.yml
index 8b6043fed4..88ea846a2d 100644
--- a/.github/workflows/ci_msw_cross.yml
+++ b/.github/workflows/ci_msw_cross.yml
@@ -7,6 +7,8 @@ on:
       - master
     paths-ignore:
       - '.github/workflows/ci.yml'
+      - '.github/workflows/ci_cmake.yml'
+      - '.github/workflows/ci_mac_selfhosted.yml'
       - 'build/tools/appveyor*.bat'
       - 'distrib/**'
       - 'docs/**'
@@ -25,6 +27,8 @@ on:
       - master
     paths-ignore:
       - '.github/workflows/ci.yml'
+      - '.github/workflows/ci_cmake.yml'
+      - '.github/workflows/ci_mac_selfhosted.yml'
       - 'build/tools/appveyor*.bat'
       - 'distrib/**'
       - 'docs/**'