From 065777c5eaed28e70585e287c25f878498659c6b Mon Sep 17 00:00:00 2001 From: "Joao Victor G. Rodrigues" Date: Wed, 8 Jan 2025 03:45:45 -0400 Subject: [PATCH 1/3] update mongodb to version 6 (#7527) * update mongodb to version 6 * chore: update mongodb version of github pipelines * update mongo version on README file --------- Co-authored-by: Joan Gallego Girona --- .github/workflows/ci_check_translations.yml | 4 ++-- .github/workflows/ci_e2e_cypress_base.yml | 6 +++--- .github/workflows/ci_e2e_cypress_pages.yml | 6 +++--- .github/workflows/ci_e2e_cypress_ssettings.yml | 6 +++--- .github/workflows/ci_e2e_puppeteer.yml | 2 +- .github/workflows/ci_unit_tests.yml | 2 +- README.md | 2 +- docker-compose.yml | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci_check_translations.yml b/.github/workflows/ci_check_translations.yml index 769251d5c2..3e6e08c2e0 100644 --- a/.github/workflows/ci_check_translations.yml +++ b/.github/workflows/ci_check_translations.yml @@ -23,7 +23,7 @@ jobs: - name: Start MongoDB uses: supercharge/mongodb-github-action@1.8.0 with: - mongodb-version: 5.0.27 + mongodb-version: 6.0 mongodb-replica-set: test-rs - uses: actions/checkout@v4 - name: Use Node.js @@ -39,7 +39,7 @@ jobs: run: yarn install - run: yarn blank-state id: blank-state-attempt1 - continue-on-error: true + continue-on-error: true env: DBHOST: localhost:27017 ELASTICSEARCH_URL: http://localhost:${{ job.services.elasticsearch.ports[9200] }} diff --git a/.github/workflows/ci_e2e_cypress_base.yml b/.github/workflows/ci_e2e_cypress_base.yml index 9373588da6..af7233a0ec 100644 --- a/.github/workflows/ci_e2e_cypress_base.yml +++ b/.github/workflows/ci_e2e_cypress_base.yml @@ -28,7 +28,7 @@ jobs: - name: Start MongoDB uses: supercharge/mongodb-github-action@1.8.0 with: - mongodb-version: 5.0.27 + mongodb-version: 6.0 mongodb-replica-set: test-rs - name: Checkout reposistory uses: actions/checkout@v4 @@ -96,7 +96,7 @@ jobs: ELASTICSEARCH_URL: http://localhost:${{ job.services.elasticsearch.ports[9200] }} DATABASE_NAME: uwazi_e2e INDEX_NAME: uwazi_e2e - TRANSPILED: true + TRANSPILED: true - run: yarn ix-config env: DBHOST: localhost:27017 @@ -119,7 +119,7 @@ jobs: browser: chrome component: false config-file: cypress.config.ts - spec: "cypress/e2e/*.cy.ts" + spec: 'cypress/e2e/*.cy.ts' timeout-minutes: 25 env: DBHOST: localhost:27017 diff --git a/.github/workflows/ci_e2e_cypress_pages.yml b/.github/workflows/ci_e2e_cypress_pages.yml index 18fd64e4d3..5c8d660726 100644 --- a/.github/workflows/ci_e2e_cypress_pages.yml +++ b/.github/workflows/ci_e2e_cypress_pages.yml @@ -28,7 +28,7 @@ jobs: - name: Start MongoDB uses: supercharge/mongodb-github-action@1.8.0 with: - mongodb-version: 5.0.27 + mongodb-version: 6.0 mongodb-replica-set: test-rs - name: Checkout reposistory uses: actions/checkout@v4 @@ -96,7 +96,7 @@ jobs: ELASTICSEARCH_URL: http://localhost:${{ job.services.elasticsearch.ports[9200] }} DATABASE_NAME: uwazi_e2e INDEX_NAME: uwazi_e2e - TRANSPILED: true + TRANSPILED: true - run: yarn ix-config env: DBHOST: localhost:27017 @@ -119,7 +119,7 @@ jobs: browser: chrome component: false config-file: cypress.config.ts - spec: "cypress/e2e/pages/*.cy.ts" + spec: 'cypress/e2e/pages/*.cy.ts' timeout-minutes: 25 env: DBHOST: localhost:27017 diff --git a/.github/workflows/ci_e2e_cypress_ssettings.yml b/.github/workflows/ci_e2e_cypress_ssettings.yml index 54cd91089c..73bf354d62 100644 --- a/.github/workflows/ci_e2e_cypress_ssettings.yml +++ b/.github/workflows/ci_e2e_cypress_ssettings.yml @@ -28,7 +28,7 @@ jobs: - name: Start MongoDB uses: supercharge/mongodb-github-action@1.8.0 with: - mongodb-version: 5.0.27 + mongodb-version: 6.0 mongodb-replica-set: test-rs - name: Checkout reposistory uses: actions/checkout@v4 @@ -96,7 +96,7 @@ jobs: ELASTICSEARCH_URL: http://localhost:${{ job.services.elasticsearch.ports[9200] }} DATABASE_NAME: uwazi_e2e INDEX_NAME: uwazi_e2e - TRANSPILED: true + TRANSPILED: true - run: yarn ix-config env: DBHOST: localhost:27017 @@ -119,7 +119,7 @@ jobs: browser: chrome component: false config-file: cypress.config.ts - spec: "cypress/e2e/settings/*.cy.ts" + spec: 'cypress/e2e/settings/*.cy.ts' timeout-minutes: 25 env: DBHOST: localhost:27017 diff --git a/.github/workflows/ci_e2e_puppeteer.yml b/.github/workflows/ci_e2e_puppeteer.yml index 7d797a743d..5470b6edc3 100644 --- a/.github/workflows/ci_e2e_puppeteer.yml +++ b/.github/workflows/ci_e2e_puppeteer.yml @@ -27,7 +27,7 @@ jobs: - name: Start MongoDB uses: supercharge/mongodb-github-action@1.8.0 with: - mongodb-version: 5.0.27 + mongodb-version: 6.0 mongodb-replica-set: test-rs - name: Checkout reposistory uses: actions/checkout@v4 diff --git a/.github/workflows/ci_unit_tests.yml b/.github/workflows/ci_unit_tests.yml index 521f7a3dd1..64474aa49a 100644 --- a/.github/workflows/ci_unit_tests.yml +++ b/.github/workflows/ci_unit_tests.yml @@ -48,7 +48,7 @@ jobs: - name: Start MongoDB uses: supercharge/mongodb-github-action@1.8.0 with: - mongodb-version: 5.0.27 + mongodb-version: 6.0 mongodb-replica-set: uwazi_replica_set mongodb-port: 27017 diff --git a/README.md b/README.md index ea727f8cd0..8994b8cb42 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Before anything else you will need to install the application dependencies: - **ElasticSearch 7.17.7** https://www.elastic.co/downloads/past-releases/elasticsearch-7-17-6 Please note that ElasticSearch requires Java. Follow the instructions to install the package manually, you also probably need to disable ml module in the ElasticSearch config file: `xpack.ml.enabled: false` - **ICU Analysis Plugin (recommended)** [installation](https://www.elastic.co/guide/en/elasticsearch/plugins/current/analysis-icu.html#analysis-icu) Adds support for number sorting in texts and solves other language sorting nuances. This option is activated by setting the env var USE_ELASTIC_ICU=true before running the server (defaults to false/unset). -- **MongoDB 5.0.27** https://www.mongodb.com/docs/v5.0/installation/ . If you have a previous version installed, please follow the instructions on how to [upgrade here](https://www.mongodb.com/docs/manual/release-notes/5.0-upgrade-standalone/). The new mongosh dependency needs to be added [installation](https://www.mongodb.com/docs/mongodb-shell/). +- **MongoDB 6.0** https://www.mongodb.com/docs/v5.0/installation/ . If you have a previous version installed, please follow the instructions on how to [upgrade here](https://www.mongodb.com/docs/manual/release-notes/5.0-upgrade-standalone/). The new mongosh dependency needs to be added [installation](https://www.mongodb.com/docs/mongodb-shell/). - **Yarn** https://yarnpkg.com/en/docs/install. - **pdftotext (Poppler)** tested to work on version 0.86 but it's recommended to use the latest available for your platform https://poppler.freedesktop.org/. Make sure to **install libjpeg-dev** if you build from source. diff --git a/docker-compose.yml b/docker-compose.yml index a84dc29aa9..bad5957d11 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,7 +17,7 @@ services: - cluster.routing.allocation.disk.threshold_enabled=false mongo: - image: "mongo:5.0.27" + image: "mongo:6.0" container_name: uwazi-mongo command: mongod --replSet "uwazi_replica_set" volumes: @@ -30,7 +30,7 @@ services: hard: "65536" mongoreplicaset_start_script: - image: "mongo:5.0.27" + image: "mongo:6.0" restart: "no" container_name: mongoreplicaset_start_script depends_on: From 78042c178f4a5fdf94685cbe662251496d99f0d8 Mon Sep 17 00:00:00 2001 From: Daneryl Date: Wed, 8 Jan 2025 08:45:51 +0100 Subject: [PATCH 2/3] Bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f0b658b17a..4a2beb30d7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uwazi", - "version": "1.194.3", + "version": "1.194.4", "description": "Uwazi is a free, open-source solution for organising, analysing and publishing your documents.", "keywords": [ "react" From 4a5a2eab552e6d8fe229da917745f3c88daaa1c7 Mon Sep 17 00:00:00 2001 From: Daneryl Date: Wed, 8 Jan 2025 08:56:07 +0100 Subject: [PATCH 3/3] Merge back from production and Bump rc version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cbd379e83d..eac65b6fd3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uwazi", - "version": "1.195.0-rc4", + "version": "1.195.0-rc5", "description": "Uwazi is a free, open-source solution for organising, analysing and publishing your documents.", "keywords": [ "react"