From b6b9b3666e47aa730324aabc0ec1bd4bb1c89584 Mon Sep 17 00:00:00 2001
From: Brenden Matthews <github@brenden.brndn.io>
Date: Thu, 25 Apr 2024 20:03:59 -0400
Subject: [PATCH] Enable cURL, RSS on mac build, lint codeql.yml

---
 .github/workflows/build-and-test-macos.yaml | 32 ++++++++++++---------
 .github/workflows/codeql.yml                |  9 +++---
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/build-and-test-macos.yaml b/.github/workflows/build-and-test-macos.yaml
index 183c7394d..cfcf9a1b1 100644
--- a/.github/workflows/build-and-test-macos.yaml
+++ b/.github/workflows/build-and-test-macos.yaml
@@ -33,20 +33,22 @@ jobs:
       - name: Install dependencies
         run: |
           brew install --force \
-            cmake \
-            freetype \
-            gettext \
-            imlib2 \
-            gperf \
-            lcov \
-            librsvg \
-            libxft \
-            libxinerama \
-            libxfixes \
-            libxi \
-            lua \
-            ninja \
-            pkg-config \
+            cmake              \
+            curl               \
+            freetype           \
+            gettext            \
+            gperf              \
+            imlib2             \
+            lcov               \
+            librsvg            \
+            libxfixes          \
+            libxft             \
+            libxi              \
+            libxinerama        \
+            libxml2            \
+            lua                \
+            ninja              \
+            pkg-config         \
             || true # Ignore errors
       - name: Checkout
         uses: actions/checkout@v4
@@ -57,6 +59,8 @@ jobs:
           cmake .. -G Ninja                    \
           -DMAINTAINER_MODE=ON                 \
           -DBUILD_WAYLAND=OFF                  \
+          -DBUILD_RSS=ON                       \
+          -DBUILD_CURL=ON                      \
           -DBUILD_TESTS=ON
       - name: Compile
         run: cmake --build build
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 886b29446..bb0f28d51 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -1,8 +1,8 @@
-name: "CodeQL"
+name: 'CodeQL'
 
 on:
   schedule:
-    - cron: "20 2 * * 0"
+    - cron: '20 2 * * 0'
 
 jobs:
   analyze:
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: ["cpp", "javascript", "python"]
+        language: ['cpp', 'javascript', 'python']
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
         # Use only 'java' to analyze code written in Java, Kotlin or both
         # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
@@ -38,7 +38,6 @@ jobs:
             libc++abi-14-dev \
             libcairo2-dev \
             libcurl4-gnutls-dev \
-            libcurl4-gnutls-dev \
             libdbus-glib-1-dev \
             libglib2.0-dev \
             libical-dev \
@@ -86,4 +85,4 @@ jobs:
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v3
         with:
-          category: "/language:${{matrix.language}}"
+          category: '/language:${{matrix.language}}'