From a1c669013233d7ea4a974c2d0292cc4ed74929ce Mon Sep 17 00:00:00 2001
From: James Turner <Turnerj@users.noreply.github.com>
Date: Fri, 12 Jul 2024 01:59:12 +0930
Subject: [PATCH] MongoDB CI fixes (#285)

* MacOS build fixes

* More CI fixes

* Fixing choco usage
---
 .github/workflows/build.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 866aebd..c3ac999 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,13 +25,18 @@ jobs:
   build:
     name: Build ${{matrix.os}}
     runs-on: ${{matrix.os}}
+    continue-on-error: ${{matrix.optional}}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest]
+        os: [ubuntu-latest, windows-latest]
         mongodb: ['6.0']
+        optional: [false]
         include:
           - os: ubuntu-latest
             ubuntu: 'jammy'
+          - os: macOS-latest
+            mongodb: '6.0'
+            optional: true
     steps:
     # Configure Redis
     - name: Configure Redis (Ubuntu)
@@ -57,15 +62,13 @@ jobs:
       if: matrix.os == 'windows-latest'
       shell: powershell
       run: |
-        choco uninstall mongodb mongodb.install
-        $latestPackageVersion = Get-LatestChocoPackageVersion -TargetVersion ${{matrix.mongodb}} -PackageName "mongodb.install"
+        $latestPackageVersion = Resolve-ChocoPackageVersion -TargetVersion ${{matrix.mongodb}} -PackageName "mongodb.install"
         choco install mongodb.portable --version=$latestPackageVersion 
     - name: Configure MongoDB (MacOS)
       if: matrix.os == 'macOS-latest'
       run: |
         brew tap mongodb/brew
         brew update
-        brew uninstall mongodb-community@5.0
         brew install mongodb-community@${{matrix.mongodb}}
         brew services start mongodb-community@${{matrix.mongodb}}