From 8cd10e6eb2331fa7223e3d86d1122631c4e26a44 Mon Sep 17 00:00:00 2001 From: Markus Fleischhacker Date: Wed, 9 Aug 2023 16:11:43 +0200 Subject: [PATCH] Improve CI Gradle caching, improve release changelogs. --- .github/workflows/workflow.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 63c96c8..89c06f6 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -79,6 +79,8 @@ jobs: run: ./gradlew sonarqube '-Dsonar.host.url=https://sonarcloud.io' '-Dsonar.login=${{ secrets.SONAR_TOKEN }}' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Stop Gradle daemons + run: ./gradlew --stop Build-and-Test-Linux: runs-on: ubuntu-latest @@ -199,7 +201,7 @@ jobs: - name: Create changelog id: changelog run: | - body_text="$(git log --pretty=format:"* %H %s" $(git describe --tags --abbrev=0 @^)..@)" + body_text="$(git log --no-merges --pretty=format:"* %H %s" $(git describe --tags --abbrev=0 @^)..@)" num_lines="$(echo "$body_text" | wc -l)" if [ "$num_lines" -gt "10" ]