From 286fdd98999755246151f80814414621b6c700b1 Mon Sep 17 00:00:00 2001 From: altrisi Date: Sun, 25 Oct 2020 12:45:16 +0100 Subject: [PATCH 1/2] Fix merge-docs failing if nothing new to merge --- .github/workflows/merge-docs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/merge-docs.yml b/.github/workflows/merge-docs.yml index aad8b6b1..4ffaf40a 100644 --- a/.github/workflows/merge-docs.yml +++ b/.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' From 82a77f4ba835e2b6ca1941e6afd4677e1bac3ba8 Mon Sep 17 00:00:00 2001 From: altrisi Date: Sun, 25 Oct 2020 12:48:56 +0100 Subject: [PATCH 2/2] Make rules-to-wiki Gradle 6 compatible --- .github/workflows/rules-to-wiki.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/rules-to-wiki.yml b/.github/workflows/rules-to-wiki.yml index 84b94361..07f5e4e6 100644 --- a/.github/workflows/rules-to-wiki.yml +++ b/.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: |