From fe8d6392d57609ef4f6195d3bd4887350a361104 Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Thu, 10 Apr 2025 14:41:11 +0100 Subject: [PATCH] Merge pull request #24793 from overleaf/bg-update-build-scripts-to-include-history-redis update build scripts to include HISTORY_REDIS_HOST GitOrigin-RevId: da0f317c80401067c0f4aa772196cb2f24849b8e --- libraries/access-token-encryptor/buildscript.txt | 2 +- libraries/fetch-utils/buildscript.txt | 2 +- libraries/logger/buildscript.txt | 2 +- libraries/metrics/buildscript.txt | 2 +- libraries/mongo-utils/buildscript.txt | 2 +- libraries/o-error/buildscript.txt | 2 +- libraries/object-persistor/buildscript.txt | 2 +- libraries/overleaf-editor-core/buildscript.txt | 2 +- libraries/promise-utils/buildscript.txt | 2 +- libraries/ranges-tracker/buildscript.txt | 2 +- libraries/redis-wrapper/buildscript.txt | 2 +- libraries/settings/buildscript.txt | 2 +- libraries/stream-utils/buildscript.txt | 2 +- services/chat/buildscript.txt | 2 +- services/clsi/buildscript.txt | 2 +- services/contacts/buildscript.txt | 2 +- services/docstore/buildscript.txt | 2 +- services/document-updater/buildscript.txt | 2 +- services/document-updater/docker-compose.ci.yml | 1 + services/document-updater/docker-compose.yml | 1 + services/filestore/buildscript.txt | 2 +- services/history-v1/buildscript.txt | 2 +- services/history-v1/docker-compose.ci.yml | 1 + services/history-v1/docker-compose.yml | 1 + services/notifications/buildscript.txt | 2 +- services/project-history/buildscript.txt | 2 +- services/project-history/docker-compose.ci.yml | 1 + services/project-history/docker-compose.yml | 1 + services/real-time/buildscript.txt | 2 +- services/real-time/docker-compose.ci.yml | 1 + services/real-time/docker-compose.yml | 1 + 31 files changed, 31 insertions(+), 23 deletions(-) diff --git a/libraries/access-token-encryptor/buildscript.txt b/libraries/access-token-encryptor/buildscript.txt index 967c3063ad..36fd724a80 100644 --- a/libraries/access-token-encryptor/buildscript.txt +++ b/libraries/access-token-encryptor/buildscript.txt @@ -7,4 +7,4 @@ access-token-encryptor --is-library=True --node-version=20.18.2 --public-repo=False ---script-version=4.5.0 +--script-version=4.7.0 diff --git a/libraries/fetch-utils/buildscript.txt b/libraries/fetch-utils/buildscript.txt index 716d3f0d5c..a158079aee 100644 --- a/libraries/fetch-utils/buildscript.txt +++ b/libraries/fetch-utils/buildscript.txt @@ -7,4 +7,4 @@ fetch-utils --is-library=True --node-version=20.18.2 --public-repo=False ---script-version=4.5.0 +--script-version=4.7.0 diff --git a/libraries/logger/buildscript.txt b/libraries/logger/buildscript.txt index 7db4c0c4c3..afe93c28dc 100644 --- a/libraries/logger/buildscript.txt +++ b/libraries/logger/buildscript.txt @@ -7,4 +7,4 @@ logger --is-library=True --node-version=20.18.2 --public-repo=False ---script-version=4.5.0 +--script-version=4.7.0 diff --git a/libraries/metrics/buildscript.txt b/libraries/metrics/buildscript.txt index 2919cb8335..74fcbdb6c6 100644 --- a/libraries/metrics/buildscript.txt +++ b/libraries/metrics/buildscript.txt @@ -7,4 +7,4 @@ metrics --is-library=True --node-version=20.18.2 --public-repo=False ---script-version=4.5.0 +--script-version=4.7.0 diff --git a/libraries/mongo-utils/buildscript.txt b/libraries/mongo-utils/buildscript.txt index ee90b005fb..a4e4fe7802 100644 --- a/libraries/mongo-utils/buildscript.txt +++ b/libraries/mongo-utils/buildscript.txt @@ -7,4 +7,4 @@ mongo-utils --is-library=True --node-version=20.18.2 --public-repo=False ---script-version=4.5.0 +--script-version=4.7.0 diff --git a/libraries/o-error/buildscript.txt b/libraries/o-error/buildscript.txt index b50683a5d6..81d3eb3252 100644 --- a/libraries/o-error/buildscript.txt +++ b/libraries/o-error/buildscript.txt @@ -7,4 +7,4 @@ o-error --is-library=True --node-version=20.18.2 --public-repo=False ---script-version=4.5.0 +--script-version=4.7.0 diff --git a/libraries/object-persistor/buildscript.txt b/libraries/object-persistor/buildscript.txt index c74883c30d..9ca6929a03 100644 --- a/libraries/object-persistor/buildscript.txt +++ b/libraries/object-persistor/buildscript.txt @@ -7,4 +7,4 @@ object-persistor --is-library=True --node-version=20.18.2 --public-repo=False ---script-version=4.5.0 +--script-version=4.7.0 diff --git a/libraries/overleaf-editor-core/buildscript.txt b/libraries/overleaf-editor-core/buildscript.txt index e49dc289bf..03b7f06791 100644 --- a/libraries/overleaf-editor-core/buildscript.txt +++ b/libraries/overleaf-editor-core/buildscript.txt @@ -7,4 +7,4 @@ overleaf-editor-core --is-library=True --node-version=20.18.2 --public-repo=False ---script-version=4.5.0 +--script-version=4.7.0 diff --git a/libraries/promise-utils/buildscript.txt b/libraries/promise-utils/buildscript.txt index ea5a4a8ef3..51a6dad532 100644 --- a/libraries/promise-utils/buildscript.txt +++ b/libraries/promise-utils/buildscript.txt @@ -7,4 +7,4 @@ promise-utils --is-library=True --node-version=20.18.2 --public-repo=False ---script-version=4.5.0 +--script-version=4.7.0 diff --git a/libraries/ranges-tracker/buildscript.txt b/libraries/ranges-tracker/buildscript.txt index 2b3aaa82d9..d112f852a7 100644 --- a/libraries/ranges-tracker/buildscript.txt +++ b/libraries/ranges-tracker/buildscript.txt @@ -7,4 +7,4 @@ ranges-tracker --is-library=True --node-version=20.18.2 --public-repo=False ---script-version=4.5.0 +--script-version=4.7.0 diff --git a/libraries/redis-wrapper/buildscript.txt b/libraries/redis-wrapper/buildscript.txt index 311348bd7c..89de51417a 100644 --- a/libraries/redis-wrapper/buildscript.txt +++ b/libraries/redis-wrapper/buildscript.txt @@ -7,4 +7,4 @@ redis-wrapper --is-library=True --node-version=20.18.2 --public-repo=False ---script-version=4.5.0 +--script-version=4.7.0 diff --git a/libraries/settings/buildscript.txt b/libraries/settings/buildscript.txt index a731e6eb1c..ed79480d31 100644 --- a/libraries/settings/buildscript.txt +++ b/libraries/settings/buildscript.txt @@ -7,4 +7,4 @@ settings --is-library=True --node-version=20.18.2 --public-repo=False ---script-version=4.5.0 +--script-version=4.7.0 diff --git a/libraries/stream-utils/buildscript.txt b/libraries/stream-utils/buildscript.txt index 0a8776469f..ad7265549c 100644 --- a/libraries/stream-utils/buildscript.txt +++ b/libraries/stream-utils/buildscript.txt @@ -7,4 +7,4 @@ stream-utils --is-library=True --node-version=20.18.2 --public-repo=False ---script-version=4.5.0 +--script-version=4.7.0 diff --git a/services/chat/buildscript.txt b/services/chat/buildscript.txt index e8020de0d4..1dc88e9fa6 100644 --- a/services/chat/buildscript.txt +++ b/services/chat/buildscript.txt @@ -6,4 +6,4 @@ chat --esmock-loader=False --node-version=20.18.2 --public-repo=False ---script-version=4.5.0 +--script-version=4.7.0 diff --git a/services/clsi/buildscript.txt b/services/clsi/buildscript.txt index 66768bb367..1834ac9648 100644 --- a/services/clsi/buildscript.txt +++ b/services/clsi/buildscript.txt @@ -7,5 +7,5 @@ clsi --esmock-loader=False --node-version=20.18.2 --public-repo=True ---script-version=4.5.0 +--script-version=4.7.0 --use-large-ci-runner=True diff --git a/services/contacts/buildscript.txt b/services/contacts/buildscript.txt index 0f4f2e643d..8563d1b71e 100644 --- a/services/contacts/buildscript.txt +++ b/services/contacts/buildscript.txt @@ -6,4 +6,4 @@ contacts --esmock-loader=True --node-version=20.18.2 --public-repo=False ---script-version=4.5.0 +--script-version=4.7.0 diff --git a/services/docstore/buildscript.txt b/services/docstore/buildscript.txt index 0fb0267ca2..c329d7b571 100644 --- a/services/docstore/buildscript.txt +++ b/services/docstore/buildscript.txt @@ -6,4 +6,4 @@ docstore --esmock-loader=False --node-version=20.18.2 --public-repo=True ---script-version=4.5.0 +--script-version=4.7.0 diff --git a/services/document-updater/buildscript.txt b/services/document-updater/buildscript.txt index f303583bcb..ee013ebea9 100644 --- a/services/document-updater/buildscript.txt +++ b/services/document-updater/buildscript.txt @@ -6,4 +6,4 @@ document-updater --esmock-loader=False --node-version=20.18.2 --public-repo=True ---script-version=4.5.0 +--script-version=4.7.0 diff --git a/services/document-updater/docker-compose.ci.yml b/services/document-updater/docker-compose.ci.yml index bdf10c9732..6deaad433d 100644 --- a/services/document-updater/docker-compose.ci.yml +++ b/services/document-updater/docker-compose.ci.yml @@ -21,6 +21,7 @@ services: ELASTIC_SEARCH_DSN: es:9200 REDIS_HOST: redis QUEUES_REDIS_HOST: redis + HISTORY_REDIS_HOST: redis ANALYTICS_QUEUES_REDIS_HOST: redis MONGO_HOST: mongo POSTGRES_HOST: postgres diff --git a/services/document-updater/docker-compose.yml b/services/document-updater/docker-compose.yml index 7dd27c9a39..e33174f9e2 100644 --- a/services/document-updater/docker-compose.yml +++ b/services/document-updater/docker-compose.yml @@ -30,6 +30,7 @@ services: environment: ELASTIC_SEARCH_DSN: es:9200 REDIS_HOST: redis + HISTORY_REDIS_HOST: redis QUEUES_REDIS_HOST: redis ANALYTICS_QUEUES_REDIS_HOST: redis MONGO_HOST: mongo diff --git a/services/filestore/buildscript.txt b/services/filestore/buildscript.txt index d40b7669c9..75a491c18a 100644 --- a/services/filestore/buildscript.txt +++ b/services/filestore/buildscript.txt @@ -7,6 +7,6 @@ filestore --esmock-loader=False --node-version=20.18.2 --public-repo=True ---script-version=4.5.0 +--script-version=4.7.0 --test-acceptance-shards=SHARD_01_,SHARD_02_,SHARD_03_ --use-large-ci-runner=True diff --git a/services/history-v1/buildscript.txt b/services/history-v1/buildscript.txt index f8c895901b..f3e029ba33 100644 --- a/services/history-v1/buildscript.txt +++ b/services/history-v1/buildscript.txt @@ -6,5 +6,5 @@ history-v1 --esmock-loader=False --node-version=20.18.2 --public-repo=False ---script-version=4.5.0 +--script-version=4.7.0 --tsconfig-extra-includes=backup-deletion-app.mjs,backup-verifier-app.mjs,backup-worker-app.mjs,api/**/*,migrations/**/*,storage/**/* diff --git a/services/history-v1/docker-compose.ci.yml b/services/history-v1/docker-compose.ci.yml index 7245ef14e2..06d5d55161 100644 --- a/services/history-v1/docker-compose.ci.yml +++ b/services/history-v1/docker-compose.ci.yml @@ -21,6 +21,7 @@ services: ELASTIC_SEARCH_DSN: es:9200 REDIS_HOST: redis QUEUES_REDIS_HOST: redis + HISTORY_REDIS_HOST: redis ANALYTICS_QUEUES_REDIS_HOST: redis MONGO_HOST: mongo POSTGRES_HOST: postgres diff --git a/services/history-v1/docker-compose.yml b/services/history-v1/docker-compose.yml index 608dd1d325..f4c885d467 100644 --- a/services/history-v1/docker-compose.yml +++ b/services/history-v1/docker-compose.yml @@ -37,6 +37,7 @@ services: environment: ELASTIC_SEARCH_DSN: es:9200 REDIS_HOST: redis + HISTORY_REDIS_HOST: redis QUEUES_REDIS_HOST: redis ANALYTICS_QUEUES_REDIS_HOST: redis MONGO_HOST: mongo diff --git a/services/notifications/buildscript.txt b/services/notifications/buildscript.txt index 10e6804ead..c52e316ffe 100644 --- a/services/notifications/buildscript.txt +++ b/services/notifications/buildscript.txt @@ -6,4 +6,4 @@ notifications --esmock-loader=False --node-version=20.18.2 --public-repo=True ---script-version=4.5.0 +--script-version=4.7.0 diff --git a/services/project-history/buildscript.txt b/services/project-history/buildscript.txt index 89ed021aa3..be5e751759 100644 --- a/services/project-history/buildscript.txt +++ b/services/project-history/buildscript.txt @@ -6,4 +6,4 @@ project-history --esmock-loader=True --node-version=20.18.2 --public-repo=False ---script-version=4.5.0 +--script-version=4.7.0 diff --git a/services/project-history/docker-compose.ci.yml b/services/project-history/docker-compose.ci.yml index bdf10c9732..6deaad433d 100644 --- a/services/project-history/docker-compose.ci.yml +++ b/services/project-history/docker-compose.ci.yml @@ -21,6 +21,7 @@ services: ELASTIC_SEARCH_DSN: es:9200 REDIS_HOST: redis QUEUES_REDIS_HOST: redis + HISTORY_REDIS_HOST: redis ANALYTICS_QUEUES_REDIS_HOST: redis MONGO_HOST: mongo POSTGRES_HOST: postgres diff --git a/services/project-history/docker-compose.yml b/services/project-history/docker-compose.yml index 39c7ed9009..deed9c5033 100644 --- a/services/project-history/docker-compose.yml +++ b/services/project-history/docker-compose.yml @@ -30,6 +30,7 @@ services: environment: ELASTIC_SEARCH_DSN: es:9200 REDIS_HOST: redis + HISTORY_REDIS_HOST: redis QUEUES_REDIS_HOST: redis ANALYTICS_QUEUES_REDIS_HOST: redis MONGO_HOST: mongo diff --git a/services/real-time/buildscript.txt b/services/real-time/buildscript.txt index 79980f013f..292fde8b4c 100644 --- a/services/real-time/buildscript.txt +++ b/services/real-time/buildscript.txt @@ -6,4 +6,4 @@ real-time --esmock-loader=False --node-version=20.18.2 --public-repo=False ---script-version=4.5.0 +--script-version=4.7.0 diff --git a/services/real-time/docker-compose.ci.yml b/services/real-time/docker-compose.ci.yml index ca9813adad..9011627c06 100644 --- a/services/real-time/docker-compose.ci.yml +++ b/services/real-time/docker-compose.ci.yml @@ -21,6 +21,7 @@ services: ELASTIC_SEARCH_DSN: es:9200 REDIS_HOST: redis QUEUES_REDIS_HOST: redis + HISTORY_REDIS_HOST: redis ANALYTICS_QUEUES_REDIS_HOST: redis MONGO_HOST: mongo POSTGRES_HOST: postgres diff --git a/services/real-time/docker-compose.yml b/services/real-time/docker-compose.yml index 5ff5afe513..d40fada758 100644 --- a/services/real-time/docker-compose.yml +++ b/services/real-time/docker-compose.yml @@ -30,6 +30,7 @@ services: environment: ELASTIC_SEARCH_DSN: es:9200 REDIS_HOST: redis + HISTORY_REDIS_HOST: redis QUEUES_REDIS_HOST: redis ANALYTICS_QUEUES_REDIS_HOST: redis MONGO_HOST: mongo