Merge branch 'master' into master

bumptech · Jan 26, 2024 · 7f90a70 · 7f90a70
2 parents 8bc22a4 + e85c765
commit 7f90a70
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/renovate.json b/renovate.json
@@ -1,8 +1,9 @@
 {
  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
  "extends": [
- "config:base"
+ "config:recommended"
  ],
+ "semanticCommits": "disabled",
  "packageRules": [
  {
  "matchUpdateTypes": ["minor", "patch", "pin", "digest"],

diff --git a/scripts/update_javadocs.sh b/scripts/update_javadocs.sh
@@ -9,8 +9,8 @@ set -o pipefail
 TEMP_DIR="/tmp/tmp_glide_javadoc"
 JAVADOC_GH_PAGES_DIR="javadocs"
 
-major_version=$(fgrep VERSION_MAJOR gradle.properties | cut -d '=' -f 2)
-minor_version=$(fgrep VERSION_MINOR gradle.properties | cut -d '=' -f 2)
+major_version=$(grep -F VERSION_MAJOR gradle.properties | cut -d '=' -f 2)
+minor_version=$(grep -F VERSION_MINOR gradle.properties | cut -d '=' -f 2)
 version="${major_version}${minor_version}0"
 
 echo "Updating javadocs for ${version}"