Merge remote-tracking branch 'origin/develop' into report-viewer/simp…

…le-e2e
jplag · Sep 6, 2023 · d1afc38 · d1afc38
2 parents e1167b3 + b867d6f
commit d1afc38
Show file tree

Hide file tree

Showing 31 changed files with 464 additions and 449 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -2,8 +2,18 @@ name: Build
 
 on:
   push: 
+    paths:
+      - ".github/workflows/maven.yml"
+      - "**/pom.xml"
+      - "**.java"
+      - "**.g4"
   pull_request:
     types: [opened, synchronize, reopened]
+    paths:
+      - ".github/workflows/maven.yml"
+      - "**/pom.xml"
+      - "**.java"
+      - "**.g4"
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

diff --git a/.github/workflows/report-viewer-test.yml → ...ub/workflows/report-viewer-build-test.yml b/.github/workflows/report-viewer-test.yml → ...ub/workflows/report-viewer-build-test.yml
@@ -4,6 +4,9 @@ on:
  workflow_dispatch:
  pull_request:
     types: [opened, synchronize, reopened]
+    paths:
+      - ".github/workflows/report-viewer-build-test.yml"
+      - "report-viewer/**"
 
 jobs:
   pre_job:

diff --git a/.github/workflows/report-viewer-dev.yml b/.github/workflows/report-viewer-dev.yml
@@ -5,6 +5,9 @@ on:
  push:
     branches:
       - develop
+    paths:
+      - ".github/workflows/report-viewer-dev.yml"
+      - "report-viewer/**"
 
 jobs:
   build-and-deploy:

diff --git a/.github/workflows/report-viewer-e2e.yml b/.github/workflows/report-viewer-e2e.yml
@@ -4,6 +4,9 @@ on:
   workflow_dispatch:
   pull_request:
     types: [opened, synchronize, reopened]
+    paths:
+      - ".github/workflows/report-viewer-e2e.yml"
+      - "report-viewer/**"
 
 jobs:
   pre_job:

diff --git a/.github/workflows/report-viewer-lint.yml b/.github/workflows/report-viewer-lint.yml
@@ -5,9 +5,13 @@ on:
   workflow_dispatch:
   push:
     path:
-      - report-viewer/**
+      - ".github/workflows/report-viewer-lint.yml"
+      - "report-viewer/**"
   pull_request:
     types: [opened, synchronize, reopened]
+    paths:
+      - ".github/workflows/report-viewer-lint.yml"
+      - "report-viewer/**"
 
 jobs:
   pre_job:

diff --git a/.github/workflows/report-viewer-prettier.yml b/.github/workflows/report-viewer-prettier.yml
@@ -3,10 +3,15 @@ name: Report Viewer Prettier Check Workflow # Checks the report viewer against t
 on:
   workflow_dispatch:
   push:
-    path:
-      - report-viewer/**
+    paths:
+      - ".github/workflows/report-viewer-prettier.yml"
+      - "report-viewer/**"
   pull_request:
     types: [opened, synchronize, reopened]
+    paths:
+      - ".github/workflows/report-viewer-prettier.yml"
+      - "report-viewer/**"
+
 
 jobs:
   pre_job:

diff --git a/...ub/workflows/sonarcloud-report-viewer.yml → ...ub/workflows/report-viewer-sonarcloud.yml b/...ub/workflows/sonarcloud-report-viewer.yml → ...ub/workflows/report-viewer-sonarcloud.yml
@@ -21,6 +21,7 @@ jobs:
   sonarcloud:
     name: SonarCloud
     runs-on: ubuntu-latest
+    if: ${{ github.actor != 'dependabot[bot]' }}
     steps:
       - uses: actions/checkout@v3
         with:

diff --git a/.github/workflows/report-viewer-unit.yml b/.github/workflows/report-viewer-unit.yml
@@ -4,6 +4,9 @@ on:
   workflow_dispatch:
   pull_request:
     types: [opened, synchronize, reopened]
+    paths:
+      - ".github/workflows/report-viewer-unit.yml"
+      - "report-viewer/**"
 
 jobs:
   pre_job:

diff --git a/.github/workflows/sonarcloud-branch.yml b/.github/workflows/sonarcloud-branch.yml
@@ -5,6 +5,11 @@ on:
     branches:
       - main
       - develop
+    paths:
+      - ".github/workflows/sonarcloud-branch.yml"
+      - "**/pom.xml"
+      - "**.java"
+      - "**.g4"
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

diff --git a/.github/workflows/spotless.yml b/.github/workflows/spotless.yml
@@ -1,9 +1,19 @@
 name: Spotless Style Check
 
 on:
-  push: 
+  push:
+    paths:
+      - ".github/workflows/spotless.yml"
+      - "**/pom.xml"
+      - "**.java"
+      - "**.g4"
   pull_request:
     types: [opened, synchronize, reopened]
+    paths:
+      - ".github/workflows/spotless.yml"
+      - "**/pom.xml"
+      - "**.java"
+      - "**.g4"
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

diff --git a/cli/pom.xml b/cli/pom.xml
@@ -116,7 +116,7 @@
         <dependency>
             <groupId>info.picocli</groupId>
             <artifactId>picocli</artifactId>
-            <version>4.7.4</version>
+            <version>4.7.5</version>
         </dependency>
     </dependencies>
     <build>

diff --git a/languages/scala/pom.xml b/languages/scala/pom.xml
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>org.scalameta</groupId>
             <artifactId>scalameta_${scala.compat.version}</artifactId>
-            <version>4.8.8</version>
+            <version>4.8.9</version>
         </dependency>
     </dependencies>
 

diff --git a/pom.xml b/pom.xml
@@ -74,7 +74,7 @@
 
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
-        <spotless.version>2.38.0</spotless.version>
+        <spotless.version>2.39.0</spotless.version>
         <slf4j.version>2.0.7</slf4j.version>
         <junit.version>5.10.0</junit.version>