Merge branch 'master' into multi_product

ftsrg · Feb 26, 2024 · f0627ae · f0627ae
2 parents f0f0316 + 9d22a98
commit f0627ae
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.github/actions/badge-creation/action.yml b/.github/actions/badge-creation/action.yml
@@ -32,9 +32,9 @@ runs:
         choco install -y rsync
     - name: Deploy badges
       if: github.ref == 'refs/heads/master' && always() && github.event_name != 'pull_request'
-      uses: leventeBajczi/github-pages-deploy-action-winfix@6d31a3c68a3912555731864c0d5ef4239b02369d # v0.3
+      uses: leventeBajczi/github-pages-deploy-action-winfix@ae3210e0f324c433418826bf51292bcf45f1676f # v0.3
       with:
         branch: badges
         folder: ${{ inputs.path }}
         target-folder: ${{ inputs.path }}
-        single-commit: true
+        single-commit: true
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
@@ -4,6 +4,8 @@ on:
   pull_request_target:
      types: [opened, synchronize, reopened]
 
+permissions: read-all
+
 concurrency: 
   group: sonar-${{ github.head_ref }}
   cancel-in-progress: true
@@ -37,11 +39,12 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.ref }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
+          persist-credentials: false
       - name: Analyze in PR
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        if: env.SONAR_TOKEN != '' && github.event_name == 'pull_request_target'
+        if: env.SONAR_TOKEN != '' && github.event_name == 'pull_request_target' && contains(github.event.pull_request.labels.*.name, 'Ready to merge')
         uses: gradle/gradle-build-action@40b6781dcdec2762ad36556682ac74e31030cfe2 # v2.5.1
         with:
           arguments: build jacocoTestReport sonar --info -Dorg.gradle.jvmargs=-XX:MaxMetaspaceSize=512m  -Dsonar.pullrequest.key=${{ github.event.pull_request.number }}