From f29669bcd1adc27b3660bc4a85505bf49c20d782 Mon Sep 17 00:00:00 2001
From: James Gallagher <jgallagher@opendap.org>
Date: Mon, 1 Jun 2026 12:58:05 -0600
Subject: [PATCH 1/2] Remove macos-intel from GHA

---
 .github/workflows/cmake.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 3398e8c1b..2f3d135ec 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -26,10 +26,6 @@ jobs:
         include:
           - os: ubuntu-latest
             name: Linux
-          - os: macos-15-intel
-            name: macOS Intel
-          # For a reason I don't entirely understand, with this build, some of the expr-tests fail.exclude:
-          # Investigate on a clean OSX M4 machine. jhrg 4/2/26
           - os: macos-15
             name: macOS arm64
     name: ${{ matrix.name }}

From b03e8de160f1a26d9c709af8e5908e757de3ca79 Mon Sep 17 00:00:00 2001
From: James Gallagher <jgallagher@opendap.org>
Date: Mon, 1 Jun 2026 13:37:03 -0600
Subject: [PATCH 2/2] Tweak to settings.json for vscode

---
 .vscode/jhrg/settings.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.vscode/jhrg/settings.json b/.vscode/jhrg/settings.json
index 919081f4a..197b7d474 100644
--- a/.vscode/jhrg/settings.json
+++ b/.vscode/jhrg/settings.json
@@ -12,9 +12,9 @@
   "C_Cpp.default.includePath": [
     "${workspaceFolder}/**",
     "${config:prefix}/include/**",
-        "${config:prefix}/deps/include",
-        "${config:HOMEBREW}/include/**"
-      ],
+    "${config:prefix}/deps/include",
+    "${config:HOMEBREW}/include/**"
+  ],
   // Makefile settings. jhrg 3/11/26
   "files.associations": {
     "*.am": "makefile"
@@ -22,7 +22,7 @@
   "[makefile]": {
     "editor.insertSpaces": false
   },
-   "[cpp]": {
+  "[cpp]": {
     "editor.rulers": [80, 120]
   },
   "rewrap.wholeComment": true,