From 4d9da914074a1384f62aa5f67460305fde49b76e Mon Sep 17 00:00:00 2001
From: Dilum Aluthge <dilum@aluthge.com>
Date: Tue, 15 Oct 2024 19:30:52 -0400
Subject: [PATCH] More CI tweaks, and temporarily disable some more CI jobs
 (#966)

---
 .github/workflows/ci.yml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 154a8989..e55dcc97 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,6 +7,7 @@ on:
       - 'master'
       - 'release-*'
     tags: '*'
+  merge_group: # GitHub Merge Queue
 
 concurrency:
   # Skip intermediate builds: all builds except for builds on the `master` branch
@@ -15,7 +16,7 @@ concurrency:
   cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
 
 jobs:
-  finalize-pr-checks:
+  finalize:
     if: always() # this line is important to keep the `finalize` job from being marked as skipped; do not change or delete this line
     runs-on: ubuntu-latest
     timeout-minutes: 10
@@ -46,7 +47,7 @@ jobs:
       matrix:
         julia-version:
           - '1.6' # previous LTS
-          - '1.9' # TODO: comment out this line once I am finished debugging.
+          # - '1.9' # TODO: uncomment this line once we fix the tests on 1.9
           - '1.10' # current LTS
           # - '1.11' # TODO: uncomment this line once we fix the tests on 1.11
           # - 'nightly' # TODO: decide whether we want to run any CI jobs on nightly.
@@ -67,9 +68,15 @@ jobs:
           # TODO: remove the following once we fix the tests for 32-bit Julia on  Windows.
           - os: windows-latest
             julia-arch: x86
+          #
           # We don't have 32-bit builds of Julia for macOS:
           - os: macos-latest
             julia-arch: x86
+          #
+          # We don't have 32-bit builds of Julia for macOS:
+          - os: macos-latest
+            julia-arch: x86
+          #
           # We don't need to run the coverage=false job for Julia < 1.9:
           - julia-version: '1.6'
             coverage: 'false'
@@ -107,6 +114,7 @@ jobs:
         run: julia --project=docs/ -e 'using Pkg; Pkg.instantiate(); include("docs/make.jl")'
   build-mylib:
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     steps:
       - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
       - uses: julia-actions/setup-julia@9b79636afcfb07ab02c256cede01fe2db6ba808c # v2.6.0
@@ -123,4 +131,4 @@ jobs:
           make
       - run: ./examples/MyLib/my_application.out
         env:
-          LD_LIBRARY_PATH: 'examples/MyLib/MyLibCompiled/lib'
\ No newline at end of file
+          LD_LIBRARY_PATH: 'examples/MyLib/MyLibCompiled/lib'