Files should contain #ddev-generated

rfay · rfay · commit f4c59f29674a · 2022-06-16T15:29:08.000-06:00
Signed-off-by: Randy Fay &lt;randy@randyfay.com&gt;
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -1,8 +1,8 @@
-name: tests
+name: ddev-drupal9-solr
 on:
   pull_request:
   push:
-    branches: [ master, main ]
+    branches: [ main ]
 
   schedule:
   - cron: '01 07 * * *'
@@ -29,7 +29,7 @@ jobs:
 
     strategy:
       matrix:
-        ddev_version: [stable, edge, HEAD]
+        ddev_version: [stable, HEAD]
 #        ddev_version: [PR]
       fail-fast: false
 
diff --git a/docker-compose.solr.yaml b/docker-compose.solr.yaml
@@ -1,4 +1,5 @@
 # DDev Apache Solr recipe file.
+#ddev-generated
 #
 #
 # To use this in your own project:
diff --git a/solr/conf/accents_en.txt b/solr/conf/accents_en.txt
@@ -1,3 +1,4 @@
+#ddev-generated
 # À => A
 "\u00C0" => "A"
 # Á => A
diff --git a/solr/conf/accents_und.txt b/solr/conf/accents_und.txt
@@ -1,3 +1,4 @@
+#ddev-generated
 # À => A
 "\u00C0" => "A"
 # Á => A
diff --git a/solr/conf/elevate.xml b/solr/conf/elevate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-
+<!-- #ddev-generated -->
 <!--
  This file allows you to boost certain search items to the top of search
  results. You can find out an item's ID by searching directly on the Solr
diff --git a/solr/conf/protwords_en.txt b/solr/conf/protwords_en.txt
@@ -1 +1 @@
-
+#ddev-generated
diff --git a/solr/conf/protwords_und.txt b/solr/conf/protwords_und.txt
@@ -1 +1,2 @@
+#ddev-generated
 
diff --git a/solr/conf/schema.xml b/solr/conf/schema.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!-- #ddev-generated -->
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with
diff --git a/solr/conf/schema_extra_fields.xml b/solr/conf/schema_extra_fields.xml
@@ -1,3 +1,4 @@
+<!-- #ddev-generated -->
 <dynamicField name="tcedgestrings_X3b_und_*" type="text_edgenstring" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
 <dynamicField name="tcedgestrings_*" type="text_edgenstring" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
 <dynamicField name="tcedgestringm_X3b_und_*" type="text_edgenstring" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
diff --git a/solr/conf/schema_extra_types.xml b/solr/conf/schema_extra_types.xml
@@ -2,6 +2,7 @@
   Edge NGram String Field
   6.0.0
 -->
+<!-- #ddev-generated -->
 <fieldType name="text_edgenstring" class="solr.TextField" positionIncrementGap="100">
   <analyzer type="index">
     <tokenizer class="solr.KeywordTokenizerFactory"/>
diff --git a/solr/conf/solrconfig.xml b/solr/conf/solrconfig.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!-- #ddev-generated -->
 
 <!DOCTYPE config [
   <!ENTITY extra SYSTEM "solrconfig_extra.xml">
diff --git a/solr/conf/solrconfig_extra.xml b/solr/conf/solrconfig_extra.xml
@@ -1,3 +1,4 @@
+<!-- #ddev-generated -->
 <searchComponent name="spellcheck" class="solr.SpellCheckComponent">
     <lst name="spellchecker">
       <str name="name">en</str>
diff --git a/solr/conf/solrconfig_index.xml b/solr/conf/solrconfig_index.xml
@@ -0,0 +1 @@
+<!-- #ddev-generated -->
diff --git a/solr/conf/solrconfig_query.xml b/solr/conf/solrconfig_query.xml
@@ -1,3 +1,4 @@
+<!-- #ddev-generated -->
 <!--
   Document Cache
   7.0.0
diff --git a/solr/conf/solrconfig_requestdispatcher.xml b/solr/conf/solrconfig_requestdispatcher.xml
@@ -1,3 +1,4 @@
+<!-- #ddev-generated -->
 <!--
   HTTP Cache Never
   7.0.0
diff --git a/solr/conf/solrcore.properties b/solr/conf/solrcore.properties
@@ -1,3 +1,4 @@
+#ddev-generated
 solr.replication.master=false
 solr.replication.slave=false
 solr.replication.pollInterval=00:00:60
diff --git a/solr/conf/stopwords_en.txt b/solr/conf/stopwords_en.txt
@@ -1,3 +1,4 @@
+#ddev-generated
 a
 an
 and
diff --git a/solr/conf/stopwords_und.txt b/solr/conf/stopwords_und.txt
@@ -1 +1,2 @@
+#ddev-generated
 
diff --git a/solr/conf/synonyms_en.txt b/solr/conf/synonyms_en.txt
@@ -1,3 +1,4 @@
+#ddev-generated
 drupal, durpal
 abettor's, abetter's
 abettor, abetter
diff --git a/solr/conf/synonyms_und.txt b/solr/conf/synonyms_und.txt
@@ -1 +1,2 @@
+#ddev-generated
 drupal, durpal
diff --git a/solr/docker-entrypoint-initdb.d/solr-configupdate.sh b/solr/docker-entrypoint-initdb.d/solr-configupdate.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+#ddev-generated
 set -e
 
 # Ensure "dev" core config is always up to date even after the

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`# DDev Apache Solr recipe file.`
	`2`	`+#ddev-generated`
`2`	`3`	`#`
`3`	`4`	`#`
`4`	`5`	`# To use this in your own project:`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#ddev-generated`
`1`	`2`	`# À => A`
`2`	`3`	`"\u00C0" => "A"`
`3`	`4`	`# Á => A`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`<?xml version="1.0" encoding="UTF-8" ?>`
	`2`	`+<!-- #ddev-generated -->`
`2`	`3`	`<!--`
`3`	`4`	`Licensed to the Apache Software Foundation (ASF) under one or more`
`4`	`5`	`contributor license agreements. See the NOTICE file distributed with`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+<!-- #ddev-generated -->`
`1`	`2`	`<dynamicField name="tcedgestrings_X3b_und_*" type="text_edgenstring" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />`
`2`	`3`	`<dynamicField name="tcedgestrings_*" type="text_edgenstring" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />`
`3`	`4`	`<dynamicField name="tcedgestringm_X3b_und_*" type="text_edgenstring" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />`