Improve CI Gradle caching, improve release changelogs.

mfl28 · Aug 9, 2023 · 8cd10e6 · 8cd10e6
1 parent 70689ea
commit 8cd10e6
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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" ]