Remove matomo (#153)

* rm matomo * Fixup CI - Only run once on PRs - Test php 8.3 - Set shell so failures fail the job * Allow config inspector to atleast complete * Update views.view.content.yml * Update views.view.content.yml * rm matomo patch * Update README.md
Islandora-Devops · Jun 5, 2024 · 77abc2f · 77abc2f
1 parent df1f993
commit 77abc2f
Show file tree

Hide file tree

Showing 51 changed files with 107 additions and 773 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,9 +1,9 @@
 ---
 name: CI
 on:
-  push: {}
-  pull_request:
+  push:
     branches: [ main ]
+  pull_request: {}
   workflow_dispatch: {}
 
 jobs:
@@ -12,13 +12,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: [ 8.1, 8.2 ]
+        php-versions: [ 8.1, 8.2, 8.3 ]
 
     name: PHP ${{ matrix.php-versions }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
@@ -28,17 +29,23 @@ jobs:
       - name: Get composer cache directory
         id: composer-cache
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
       - name: Cache dependencies
         uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
+
       - name: Install dependencies
         run: composer install
+
       - name: Test site installation
+        shell: bash
         run: composer exec -- drush site:install --existing-config --db-url=sqlite:test_db
+
       - name: Inspect configuration
+        shell: bash
         # Just warnings, for now...
         continue-on-error: true
         run: |

diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ tools and services that support it, try one of the Islandora deployment tools:
 ## Manual Installation
 
 The config files in the Starter Site assume a full suite of external services.
-If you do not need all the external services (such as Fedora or Matomo) then
+If you do not need all the external services (such as Fedora) then
 you can skip them but you will also want to adjust the Drupal configs. Such a
 partial install is beyond the scope of this document.
 
@@ -69,12 +69,10 @@ If not the default `tcp://127.0.0.1:61613`, this will have to be set (see Usage
 | `islandora-connector-fits`                | CrayFits derivative processor                              |
 
 7. A [Drupal-compatible web server](https://www.drupal.org/docs/system-requirements/web-server-requirements)
-8. A [Matomo installation](https://matomo.org/)
-    * Further details in the [`matomo` module's](https://www.drupal.org/project/matomo) documentation
-9. [FITS Web Service](https://projects.iq.harvard.edu/fits/downloads#fits-servlet) and
+8. [FITS Web Service](https://projects.iq.harvard.edu/fits/downloads#fits-servlet) and
 [CrayFits](https://github.com/roblib/CrayFits) installed
     * Further details in the [`islandora_fits` module's](https://github.com/roblib/islandora_fits) README/documentation
-10. A Solr server installed or available with a core set up
+9. A Solr server installed or available with a core set up
     * Further details on [Drupal's Search API Solr module](https://www.drupal.org/project/search_api_solr) page.
     * If not available at `127.0.0.1:8983`, or if the core name is not `ISLANDORA` its information will need to be set up (see Usage step 5)
 
@@ -133,7 +131,6 @@ Change the following Drupal configs to your values using any method (GUI,
 | ActiveMQ (broker)               | `islandora.settings broker_url`       | `tcp://127.0.0.1:61613`                   |
 | Cantaloupe (for OpenSeadragon)  | `openseadragon.settings iiif_server`  | `http://127.0.0.1:8080/cantaloupe/iiif/2` |
 | Cantaloupe (for Islandora IIIF) | `islandora_iiif.settings iiif_server` | `http://127.0.0.1:8080/cantaloupe/iiif/2` |
-| Matomo URL                      | `matomo.settings url_http`            | `http://localhost:8000/matomo/`           |
 | Solr - URL                      | `search_api.server.default_solr_server backend_config.connector_config.host` | `127.0.0.1` |
 | Solr - port                     | `search_api.server.default_solr_server backend_config.connector_config.port` | `8983` |
 | Solr - core name                | `search_api.server.default_solr_server backend_config.connector_config.core` | `ISLANDORA` |

diff --git a/assets/patches/matomo-3363521-7.patch b/assets/patches/matomo-3363521-7.patch
diff --git a/composer.json b/composer.json
@@ -49,7 +49,6 @@
         "drupal/fpa": "^4.0",
         "drupal/hal": "^1.0||^2.0",
         "drupal/islandora": "^2.8.1",
-        "drupal/matomo": "^1.19",
         "drupal/openseadragon": "^2",
         "drupal/pathauto": "^1.12",
         "drupal/pdf": "^1.1",

diff --git a/composer.lock b/composer.lock
diff --git a/config/sync/core.entity_form_display.user.user.default.yml b/config/sync/core.entity_form_display.user.user.default.yml
@@ -24,11 +24,6 @@ content:
   language:
     weight: 0
     region: content
-  matomo:
-    weight: 3
-    region: content
-    settings: {  }
-    third_party_settings: {  }
   timezone:
     weight: 6
     region: content

diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml
@@ -74,7 +74,6 @@ module:
   key: 0
   language: 0
   link: 0
-  matomo: 0
   media: 0
   media_library: 0
   menu_link_content: 0

diff --git a/config/sync/matomo.settings.yml b/config/sync/matomo.settings.yml
diff --git a/config/sync/search_api_solr.solr_cache.cache_document_default_7_0_0.yml b/config/sync/search_api_solr.solr_cache.cache_document_default_7_0_0.yml
@@ -14,4 +14,4 @@ cache:
   size: 512
   initialSize: 512
   autowarmCount: 0
-solr_configs: null
+solr_configs: { }
diff --git a/config/sync/search_api_solr.solr_cache.cache_document_default_9_0_0.yml b/config/sync/search_api_solr.solr_cache.cache_document_default_9_0_0.yml
@@ -14,4 +14,4 @@ cache:
   size: 512
   initialSize: 512
   autowarmCount: 0
-solr_configs: null
+solr_configs: { }
diff --git a/config/sync/search_api_solr.solr_cache.cache_persegfilter_default_7_0_0.yml b/config/sync/search_api_solr.solr_cache.cache_persegfilter_default_7_0_0.yml
@@ -15,4 +15,4 @@ cache:
   initialSize: 0
   autowarmCount: 10
   regenerator: solr.NoOpRegenerator
-solr_configs: null
+solr_configs: { }
diff --git a/config/sync/search_api_solr.solr_cache.cache_persegfilter_default_9_0_0.yml b/config/sync/search_api_solr.solr_cache.cache_persegfilter_default_9_0_0.yml
@@ -15,4 +15,4 @@ cache:
   initialSize: 0
   autowarmCount: 10
   regenerator: solr.NoOpRegenerator
-solr_configs: null
+solr_configs: { }
diff --git a/config/sync/search_api_solr.solr_field_type.text_edge_und_6_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_edge_und_6_0_0.yml
@@ -68,8 +68,8 @@ field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
-unstemmed_field_type: null
-spellcheck_field_type: null
-collated_field_type: null
+unstemmed_field_type: { }
+spellcheck_field_type: { }
+collated_field_type: { }
 solr_configs: {  }
 text_files: {  }
diff --git a/config/sync/search_api_solr.solr_field_type.text_edge_und_7_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_edge_und_7_0_0.yml
@@ -70,8 +70,8 @@ field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
-unstemmed_field_type: null
-spellcheck_field_type: null
-collated_field_type: null
+unstemmed_field_type: { }
+spellcheck_field_type: { }
+collated_field_type: { }
 solr_configs: {  }
 text_files: {  }
diff --git a/config/sync/search_api_solr.solr_field_type.text_edgestring_und_6_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_edgestring_und_6_0_0.yml
@@ -38,8 +38,8 @@ field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
-unstemmed_field_type: null
-spellcheck_field_type: null
-collated_field_type: null
+unstemmed_field_type: { }
+spellcheck_field_type: { }
+collated_field_type: { }
 solr_configs: {  }
 text_files: {  }
diff --git a/config/sync/search_api_solr.solr_field_type.text_en_6_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_en_6_0_0.yml
@@ -164,7 +164,7 @@ unstemmed_field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
-spellcheck_field_type: null
+spellcheck_field_type: { }
 collated_field_type:
   name: collated_en
   class: solr.ICUCollationField

diff --git a/config/sync/search_api_solr.solr_field_type.text_en_7_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_en_7_0_0.yml
@@ -168,7 +168,7 @@ unstemmed_field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
-spellcheck_field_type: null
+spellcheck_field_type: { }
 collated_field_type:
   name: collated_en
   class: solr.ICUCollationField

diff --git a/config/sync/search_api_solr.solr_field_type.text_ngram_und_6_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_ngram_und_6_0_0.yml
@@ -68,8 +68,8 @@ field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
-unstemmed_field_type: null
-spellcheck_field_type: null
-collated_field_type: null
+unstemmed_field_type: { }
+spellcheck_field_type: { }
+collated_field_type: { }
 solr_configs: {  }
 text_files: {  }
diff --git a/config/sync/search_api_solr.solr_field_type.text_ngram_und_7_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_ngram_und_7_0_0.yml
@@ -70,8 +70,8 @@ field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
-unstemmed_field_type: null
-spellcheck_field_type: null
-collated_field_type: null
+unstemmed_field_type: { }
+spellcheck_field_type: { }
+collated_field_type: { }
 solr_configs: {  }
 text_files: {  }