Skip to content

Commit f244207

Browse files
committed
fix mongo download link for 4.2 4.4 explicitly
1 parent 0620ac5 commit f244207

File tree

5 files changed

+15
-10
lines changed

5 files changed

+15
-10
lines changed

.github/workflows/github-actions.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ on:
1313
env:
1414
MONGODB_3_6: 3.6.14
1515
MONGODB_4_0: 4.0.23
16-
MONGODB_4_2: 4.2.12
17-
MONGODB_4_4: 4.4.4
16+
MONGODB_4_2: 4.2
17+
MONGODB_4_4: 4.4
1818

1919
PYMONGO_3_4: 3.4
2020
PYMONGO_3_6: 3.6
@@ -52,7 +52,7 @@ jobs:
5252
MONGODB: $MONGODB_3_6
5353
PYMONGO: $PYMONGO_3_9
5454
- python-version: 3.7
55-
MONGODB: MONGODB_4_2
55+
MONGODB: $MONGODB_4_2
5656
PYMONGO: $PYMONGO_3_6
5757
- python-version: 3.7
5858
MONGODB: $MONGODB_4_4

.github/workflows/install_mongo.sh

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@ MONGODB=$1
55
# Mongo > 4.0 follows different name convention for download links
66
mongo_build=mongodb-linux-x86_64-${MONGODB}
77

8-
if [[ "$MONGODB" == *"4."* ]] && [[ ! "$MONGODB" == *"4.0"* ]]; then
9-
echo "It's there."
10-
mongo_build=mongodb-linux-x86_64-ubuntu2004-v${MONGODB}-latest
8+
if [[ "$MONGODB" == *"4.2"* ]]; then
9+
mongo_build=mongodb-linux-x86_64-ubuntu1804-v${MONGODB}-latest
10+
elif [[ "$MONGODB" == *"4.4"* ]]; then
11+
mongo_build=mongodb-linux-x86_64-ubuntu1804-v${MONGODB}-latest
1112
fi
1213

1314
wget http://fastdl.mongodb.org/linux/$mongo_build.tgz
1415
tar xzf $mongo_build.tgz
15-
${PWD}/$mongo_build/bin/mongod --version
16+
17+
mongodb_dir=$(find ${PWD}/ -type d -name "mongodb-linux-x86_64*")
18+
$mongodb_dir/bin/mongod --version

.github/workflows/start_mongo.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
MONGODB=$1
44

5-
mongodb_dir=${PWD}/mongodb-linux-x86_64-${MONGODB}
5+
mongodb_dir=$(find ${PWD}/ -type d -name "mongodb-linux-x86_64*")
6+
67
mkdir $mongodb_dir/data
78
$mongodb_dir/bin/mongod --dbpath $mongodb_dir/data --logpath $mongodb_dir/mongodb.log --fork
89
mongo --eval 'db.version();' # Make sure mongo is awake

mongoengine/mongodb_support.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
# get_mongodb_version()
99
MONGODB_34 = (3, 4)
1010
MONGODB_36 = (3, 6)
11+
MONGODB_42 = (4, 2)
1112
MONGODB_44 = (4, 4)
1213

1314

tests/document/test_indexes.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
from mongoengine import *
99
from mongoengine.connection import get_db
10-
from mongoengine.mongodb_support import MONGODB_44, get_mongodb_version
10+
from mongoengine.mongodb_support import MONGODB_42, get_mongodb_version
1111

1212

1313
class TestIndexes(unittest.TestCase):
@@ -454,7 +454,7 @@ class Test(Document):
454454
== "IXSCAN"
455455
)
456456
mongo_db = get_mongodb_version()
457-
PROJECTION_STR = "PROJECTION" if mongo_db < MONGODB_44 else "PROJECTION_COVERED"
457+
PROJECTION_STR = "PROJECTION" if mongo_db < MONGODB_42 else "PROJECTION_COVERED"
458458
assert (
459459
query_plan.get("queryPlanner").get("winningPlan").get("stage")
460460
== PROJECTION_STR

0 commit comments

Comments
 (0)