Merge pull request #508 from altrisi/patch-1

[Actions] Fix and compatibility

.github/workflows/merge-docs.yml

@@ -12,6 +12,7 @@ jobs:
       - name: Merge docs
         run: ./mergedoc.sh
       - name: Commit merged docs
+        continue-on-error: true
         run: |
           git config --global user.name 'github-actions[bot]'
           git config --global user.email 'github-actions[bot]@users.noreply.github.com'

.github/workflows/rules-to-wiki.yml

@@ -64,7 +64,15 @@ jobs:
           repository: ${{github.repository}}.wiki
           path: wiki
       - name: Proccess Gradle log into a pretty wiki page
-        run: from1="# Carpet"; to2="BUILD SUCCESSFUL"; a="$(cat settings-toProccess.txt)"; a="$(echo "${a#*"$from1"}")"; echo "$from1${a%%"$to2"*}" > wiki/Current-Available-Settings.md
+        run: |
+          from1="# Carpet";
+          File=settings-toProccess.txt
+          if grep -q "Deprecated Gradle features" "$File"; then # Happens after update to Gradle 6
+            to2="Deprecated Gradle features";
+          else
+            to2="BUILD SUCCESSFUL"
+          fi
+          a="$(cat settings-toProccess.txt)"; a="$(echo "${a#*"$from1"}")"; echo "$from1${a%%"$to2"*}" > wiki/Current-Available-Settings.md
       - name: Commit updated wiki page
         continue-on-error: true
         run: |