Merge pull request #7 from itsallcode/skip-sonar-for-external-pr

Run sonar only when token is available
itsallcode · Apr 17, 2021 · 53bdaea · 53bdaea
2 parents 5b37ba4 + c1e562c
commit 53bdaea
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,7 +26,12 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-maven-
     - name: Build with Maven
-      run: mvn --errors --batch-mode "-Dsonar.host.url=https://sonarcloud.io" -Dsonar.organization=itsallcode -Dsonar.login=$SONAR_TOKEN clean org.jacoco:jacoco-maven-plugin:prepare-agent install sonar:sonar
+      run: mvn --errors --batch-mode clean org.jacoco:jacoco-maven-plugin:prepare-agent install
+      env:
+        MAVEN_OPTS: "-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
+    - name: Sonar
+      if: ${{ env.SONAR_TOKEN != null }}
+      run: mvn --errors --batch-mode "-Dsonar.host.url=https://sonarcloud.io" -Dsonar.organization=itsallcode -Dsonar.login=$SONAR_TOKEN sonar:sonar
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [develop, master]
   pull_request:
-    branches: [develop]
+    branches: [develop, master]
   schedule:
     - cron: '0 4 * * 3'
 

diff --git a/src/test/java/org/itsallcode/matcher/ITestMultilineTextMatcher.java b/src/test/java/org/itsallcode/matcher/ITestMultilineTextMatcher.java
@@ -30,24 +30,24 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.not;
 
-public class ITestMultilineTextMatcher
+class ITestMultilineTextMatcher
 {
     private static final String LINE_SEPARATOR = System.lineSeparator();
 
     @Test
-    public void testMatchesAllLines()
+    void testMatchesAllLines()
     {
         assertThat("foo" + LINE_SEPARATOR + "bar", MultilineTextMatcher.matchesAllLines("foo", "bar"));
     }
 
     @Test
-    public void testDoesNotMatchAllLines()
+    void testDoesNotMatchAllLines()
     {
         assertThat("bar" + LINE_SEPARATOR + "foo", not(MultilineTextMatcher.matchesAllLines("foo", "bar")));
     }
 
     @Test
-    public void testDoesNotMatchDifferentLineCount()
+    void testDoesNotMatchDifferentLineCount()
     {
         assertThat("foo", not(MultilineTextMatcher.matchesAllLines("foo", "bar")));
     }

diff --git a/src/test/java/org/itsallcode/matcher/TestMultilineTextMatcher.java b/src/test/java/org/itsallcode/matcher/TestMultilineTextMatcher.java
@@ -32,25 +32,25 @@
 import org.hamcrest.StringDescription;
 import org.junit.jupiter.api.Test;
 
-public class TestMultilineTextMatcher
+class TestMultilineTextMatcher
 {
     private static final String LINE_SEPARATOR = System.lineSeparator();
     private static final String STANDARD_TWO_LINE_TEXT = "Line 1\nLine 2";
 
     @Test
-    public void testMatchesSafely()
+    void testMatchesSafely()
     {
         assertThat(new MultilineTextMatcher(STANDARD_TWO_LINE_TEXT).matchesSafely(STANDARD_TWO_LINE_TEXT), equalTo(true));
     }
 
     @Test
-    public void testDoesNotMatchSafely()
+    void testDoesNotMatchSafely()
     {
         assertThat(new MultilineTextMatcher(STANDARD_TWO_LINE_TEXT).matchesSafely("blah"), equalTo(false));
     }
 
     @Test
-    public void testDescribeMismatchSafelyLine1Different()
+    void testDescribeMismatchSafelyLine1Different()
     {
         final Description description = new StringDescription();
         final MultilineTextMatcher matcher = new MultilineTextMatcher(STANDARD_TWO_LINE_TEXT);
@@ -59,7 +59,7 @@ public void testDescribeMismatchSafelyLine1Different()
     }
 
     @Test
-    public void testDescribeMismatchSafelyDifferentLineCount()
+    void testDescribeMismatchSafelyDifferentLineCount()
     {
         final Description description = new StringDescription();
         final MultilineTextMatcher matcher = new MultilineTextMatcher(STANDARD_TWO_LINE_TEXT);
@@ -69,7 +69,7 @@ public void testDescribeMismatchSafelyDifferentLineCount()
     }
 
     @Test
-    public void testDescribeTo()
+    void testDescribeTo()
     {
         final Description description = new StringDescription();
         final MultilineTextMatcher matcher = new MultilineTextMatcher(STANDARD_TWO_LINE_TEXT);