Merge pull request #355 from unfoldingWord/root-v1.20-and-main

Merge root-v1.20-and-main into release/dcs/v1.20
unfoldingWord · Jun 20, 2023 · 299306d · 299306d
2 parents 2837b72 + ca5c88b
commit 299306d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 31 deletions.
diff --git a/docker/manifest.rootless.tmpl b/docker/manifest.rootless.tmpl
@@ -1,4 +1,4 @@
-image: unfoldingword/dcs:{{#if build.tag}}{{trimSuffix "-dcs" (trimPrefix "v" build.tag)}}{{else}}{{#if (hasPrefix "refs/heads/release/v" build.ref)}}{{trimPrefix "refs/heads/release/v" build.ref}}-{{/if}}nightly{{/if}}-rootless
+image: unfoldingword/dcs:{{#if build.tag}}{{trimSuffix "-dcs" (trimPrefix "v" build.tag)}}{{else}}{{#if (hasPrefix "refs/heads/dcs/v" build.ref)}}{{trimPrefix "refs/heads/release/dcs/v" build.ref}}-{{/if}}nightly{{/if}}-rootless
 {{#if build.tags}}
 {{#unless (contains "-rc" build.tag)}}
 tags:
@@ -10,12 +10,12 @@ tags:
 {{/if}}
 manifests:
   -
-    image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}{{#if (hasPrefix "refs/heads/release/v" build.ref)}}{{trimPrefix "refs/heads/release/v" build.ref}}-{{/if}}nightly{{/if}}-linux-amd64-rootless
+    image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}{{#if (hasPrefix "refs/heads/release/dcs/v" build.ref)}}{{trimPrefix "refs/heads/dcs/v" build.ref}}-{{/if}}nightly{{/if}}-linux-amd64-rootless
     platform:
       architecture: amd64
       os: linux
   -
-    image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}{{#if (hasPrefix "refs/heads/release/v" build.ref)}}{{trimPrefix "refs/heads/release/v" build.ref}}-{{/if}}nightly{{/if}}-linux-arm64-rootless
+    image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}{{#if (hasPrefix "refs/heads/release/dcs/v" build.ref)}}{{trimPrefix "refs/heads/release/dcs/v" build.ref}}-{{/if}}nightly{{/if}}-linux-arm64-rootless
     platform:
       architecture: arm64
       os: linux

diff --git a/templates/catalog/info_icon.tmpl b/templates/catalog/info_icon.tmpl
@@ -7,9 +7,8 @@ Multiple phrases/fields can be used by separating them with a comma and a space.
 The following fields can be used to search specific metadata:
 	<em>subject:, lang:, book:, owner:, repo:, tag:, metadata_type:,
 		metadata_version: and checkinglevel:</em>
-	Example: <em>subject:obs study notes, lang:en,fr, Larry</em>
+	Example: <em>subject:obs study notes, lang:en,fr</em>
 		Returns all "OBS Study Notes" entries that are in English & French
-		with the keyword "Larry" (matches "contributor")
 Wildcards: Use _ for any character
 	Use % for any # of characters
 	Use \_ and \% to search for literal _ and %</pre>

diff --git a/templates/explore/info_icon.tmpl b/templates/explore/info_icon.tmpl
@@ -7,9 +7,8 @@ Multiple phrases/fields can be searched by separating with a comma and a space.
 The following fields can be used to search specific metadata:
 	<em>subject:, lang:, book:, owner:, repo:, metadata_type:,
 		and metadata_version:</em>
-	Example: <em>subject:obs study notes, lang:en,fr, Larry</em>
+	Example: <em>subject:obs study notes, lang:en,fr</em>
 		Returns all "OBS Study Notes" entries that are in English & French
-		with the keyword "Larry" (matches "contributor")
 Wildcards: Use _ for any character
 	Use % for any # of characters
 	Use \_ and \% to search for literal _ and %</pre>

diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl