From 48b66ff57ce6c7962fafe062bdf8e5946ec3e095 Mon Sep 17 00:00:00 2001 From: Daniel Diaz <39510674+IslandRhythms@users.noreply.github.com> Date: Wed, 20 Mar 2024 12:46:49 -0400 Subject: [PATCH 1/4] consolidate scripts --- package.json | 1 - scripts/website.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 23ee85bebe4..73c129ca94c 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,6 @@ "docs:checkout:5x": "git checkout 5.x", "docs:checkout:6x": "git checkout 6.x", "docs:generate": "node ./scripts/website.js", - "docs:generate:search": "node ./scripts/generateSearch.js", "docs:generate:sponsorData": "node ./scripts/loadSponsorData.js", "docs:merge:stable": "git merge master", "docs:merge:5x": "git merge 5.x", diff --git a/scripts/website.js b/scripts/website.js index 3ec3845ae08..63779a7e7be 100644 --- a/scripts/website.js +++ b/scripts/website.js @@ -10,7 +10,7 @@ const pug = require('pug'); const pkg = require('../package.json'); const transform = require('acquit-require'); const childProcess = require("child_process"); - +require('./generateSearch'); // using "__dirname" and ".." to have a consistent CWD, this script should not be runnable, even when not being in the root of the project // also a consistent root path so that it is easy to change later when the script should be moved const cwd = path.resolve(__dirname, '..'); From ec317fe2f16ffe081089e116e5951ed7ad76c7aa Mon Sep 17 00:00:00 2001 From: Daniel Diaz <39510674+IslandRhythms@users.noreply.github.com> Date: Wed, 20 Mar 2024 12:52:49 -0400 Subject: [PATCH 2/4] remove server timeout option --- scripts/generateSearch.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/generateSearch.js b/scripts/generateSearch.js index d8cb16f104b..5497044668e 100644 --- a/scripts/generateSearch.js +++ b/scripts/generateSearch.js @@ -126,7 +126,7 @@ run().catch(async error => { }); async function run() { - await mongoose.connect(config.uri, { dbName: 'mongoose', serverSelectionTimeoutMS: 5000 }); + await mongoose.connect(config.uri, { dbName: 'mongoose' }); // wait for the index to be created await Content.init(); From 37887ce960ed2b4f19cc8a319aab4ad5e7a380f7 Mon Sep 17 00:00:00 2001 From: Valeri Karpov Date: Wed, 20 Mar 2024 16:12:40 -0400 Subject: [PATCH 3/4] chore: setup mongodb server v5.0.14 to test generating search data --- .github/workflows/documentation.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 75f6b49d93a..4b6344764a8 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -57,5 +57,15 @@ jobs: node-version: 16 - run: npm install + - name: Setup MongoDB + run: | + wget -q https://downloads.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2004-5.0.14.tgz + tar xf mongodb-linux-x86_64-ubuntu2004-5.0.14.tgz + mkdir -p ./data/db/27017 ./data/db/27000 + printf "\n--timeout 8000" >> ./test/mocha.opts + ./mongodb-linux-x86_64-ubuntu2004-5.0.14/bin/mongod --setParameter ttlMonitorSleepSecs=1 --fork --dbpath ./data/db/27017 --syslog --port 27017 + sleep 2 + mongod --version + echo `pwd`/mongodb-linux-x86_64-ubuntu2004-5.0.14/bin >> $GITHUB_PATH - run: npm run docs:clean - run: npm run docs:generate From 49e26350941e91db59400d3cdae623dddedac801 Mon Sep 17 00:00:00 2001 From: Valeri Karpov Date: Wed, 20 Mar 2024 16:24:18 -0400 Subject: [PATCH 4/4] test: setup config file for testing docs generation --- .github/workflows/documentation.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 4b6344764a8..f20394fdb22 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -67,5 +67,8 @@ jobs: sleep 2 mongod --version echo `pwd`/mongodb-linux-x86_64-ubuntu2004-5.0.14/bin >> $GITHUB_PATH + - name: Setup config + run: | + echo "module.exports = {uri:'mongodb://127.0.0.1:27017/mongoose_test'};" > ./.config.js - run: npm run docs:clean - run: npm run docs:generate