Merge branch '2.9' into merge-2.9-20220112

sdg0919 · Jan 12, 2022 · 113ec45 · 113ec45
2 parents f5e93e6 + 935720c
commit 113ec45
Showing 1 changed file with 5 additions and 13 deletions.
diff --git a/.github/workflows/client-tests.yml b/.github/workflows/client-tests.yml
@@ -48,14 +48,6 @@ jobs:
     - name: "Install Mongo Dependencies: ubuntu-latest"
       if: (matrix.os == 'ubuntu-latest')
       run: |
-        # Remove the default mongo
-        for version in "4.2" "4.4"; do
-          sudo rm "/etc/apt/sources.list.d/mongodb-org-${version}.list" || true
-        done
-        sudo DEBIAN_FRONTEND=noninteractive apt-get purge -y mongodb-org
-        sudo DEBIAN_FRONTEND=noninteractive apt autoremove
-        sudo rm -rf /usr/bin/mongo* || true
-
         make install-mongo-dependencies
 
     - name: "Remove Mongo Dependencies: windows-latest"
@@ -68,18 +60,18 @@ jobs:
       if: (matrix.os == 'windows-latest')
       uses: crazy-max/ghaction-chocolatey@v1
       with:
-        args: install mongodb.install --version=4.0.21 --allow-downgrade
+        args: install mongodb.install --version=5.0.5 --allow-downgrade
 
     # GitHub runners already have preinstalled version of mongodb, but
-    # we specifically need 4.0.21, otherwise our tests will not pass
+    # we specifically need 5.0.5, otherwise our tests will not pass
     - name: "Install Mongo Dependencies: macOS-latest"
       if: (matrix.os == 'macOS-latest')
       run: |
-        curl -o mongodb-4.0.21.tgz https://fastdl.mongodb.org/osx/mongodb-osx-ssl-x86_64-4.0.21.tgz
-        tar xzvf mongodb-4.0.21.tgz
+        curl -o mongodb-5.0.5.tgz https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-5.0.5.tgz
+        tar xzvf mongodb-5.0.5.tgz
         sudo rm -rf /usr/local/mongodb
         sudo mkdir -p /usr/local/mongodb
-        sudo mv mongodb-osx-x86_64-4.0.21/bin/* /usr/local/mongodb
+        sudo mv mongodb-macos-x86_64-5.0.5/bin/* /usr/local/mongodb
         sudo mkdir -p /usr/local/bin
         sudo rm /usr/local/bin/mongod
         sudo ln -s /usr/local/mongodb/mongod /usr/local/bin/mongod