From 104e3ba66952f845e4c6a52da0c7cffa658f6061 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Tue, 4 Oct 2022 14:29:05 +0000 Subject: [PATCH 1/2] Unversion Firefox, Upgrade PostGIS to 3.3 We use Firefox for JS testing. Every 10 versions we have to update the version string. Firefox has been stable for the last few years, and the tests have not broken. By unversioning it we will get the latest version every time, which should be fine given the stability over the last few years. PostGIS 3.3 is needed because a step in provisioning requests ST_TriangulatePolygon, which is only available in PostGIS 3.3. It is unclear what is requesting that. This does not have an impact on us, because we're not using any feature that is deprecated in PostGIS 3.3. --- deployment/ansible/group_vars/all | 2 +- .../model-my-watershed.app/tasks/dev-and-test-dependencies.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/ansible/group_vars/all b/deployment/ansible/group_vars/all index 08426ebf5..474a00072 100644 --- a/deployment/ansible/group_vars/all +++ b/deployment/ansible/group_vars/all @@ -20,7 +20,7 @@ postgresql_support_repository_channel: "main" postgresql_support_libpq_version: "13.*.pgdg20.04+1" postgresql_support_psycopg2_version: "2.8.*" postgis_version: "3" -postgis_package_version: "3.2*pgdg20.04+1" +postgis_package_version: "3.3*pgdg20.04+1" daemontools_version: "1:0.76-7" diff --git a/deployment/ansible/roles/model-my-watershed.app/tasks/dev-and-test-dependencies.yml b/deployment/ansible/roles/model-my-watershed.app/tasks/dev-and-test-dependencies.yml index f1df9d8d1..5053fa062 100644 --- a/deployment/ansible/roles/model-my-watershed.app/tasks/dev-and-test-dependencies.yml +++ b/deployment/ansible/roles/model-my-watershed.app/tasks/dev-and-test-dependencies.yml @@ -1,6 +1,6 @@ --- - name: Install Firefox for UI tests - apt: pkg="firefox=9*" state=present + apt: pkg="firefox" state=present - name: Install Xvfb for JavaScript tests apt: pkg="xvfb=2:1.20.*" state=present From aa9b43fedbad6d0a894cd42085834e7f3ba98daf Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Tue, 4 Oct 2022 14:29:39 +0000 Subject: [PATCH 2/2] Instruct to upgrade base box This solves a number of problems on macOS --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 547a02d97..b4f73a5de 100644 --- a/README.md +++ b/README.md @@ -52,9 +52,10 @@ echo " * 33.33.0.0/16" | sudo tee /etc/vbox/networks.conf ``` -Next, use the following command to bring up a local development environment: +Next, use the following command to bring up a local development environment, ensuring you have the most recent version of the base box: ```bash +$ vagrant box update $ vagrant up ```