combine all java and combine all typescript

broadinstitute · Jul 21, 2023 · 7023028 · 7023028
1 parent 2781dab
commit 7023028
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 22 deletions.
diff --git a/.github/workflows/java-ci.yml b/.github/workflows/java-ci.yml
@@ -12,12 +12,13 @@
 name: Java CI
 
 on:
-  push:
-    branches: [ development ]
-    paths-ignore: [ '*.md']
-  pull_request:
-    branches: [ '**' ]
-  merge_group:
+  # push:
+  #   branches: [ development ]
+  #   paths-ignore: [ '*.md']
+  # pull_request:
+  #   branches: [ '**' ]
+  # merge_group:
+  workflow_dispatch:
 
 jobs:
   build:
@@ -56,7 +57,6 @@ jobs:
           arguments: build --info # if you need to see test failure full stacktraces, change this to `build --info`
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 
   # Need to uncomment these in follow up PR, The new Trivy and Tag workflows need to exist on the development branch
   # before the following steps will work

diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml
@@ -27,31 +27,29 @@ jobs:
   #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
   #         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 
-  sonar-api-admin:
-    name: SonarCloud api-admin
+  sonar-java:
+    name: SonarCloud Java
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Scan api-admin via gradle
-        run: ./gradlew --build-cache :api-admin:compileJava :api-admin:sonar
+      - name: Scan via gradle
+        run: ./gradlew --build-cache compileJava sonar
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 
 
-  sonar-ui-admin:
-    name: SonarCloud ui-admin
+  sonar-typescript:
+    name: SonarCloud TypeScript
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Scan ui-admin via sonarcloud-github-action
+      - name: Scan via sonarcloud-github-action
         uses: SonarSource/sonarcloud-github-action@master
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        with:
-          projectBaseDir: ui-admin/
diff --git a/.github/workflows/ui-ci.yml b/.github/workflows/ui-ci.yml
@@ -1,12 +1,13 @@
 name: UI CI
 
 on:
-  push:
-    branches: [ development ]
-    paths-ignore: [ '*.md']
-  pull_request:
-    branches: [ '**' ]
-  merge_group:
+  # push:
+  #   branches: [ development ]
+  #   paths-ignore: [ '*.md']
+  # pull_request:
+  #   branches: [ '**' ]
+  # merge_group:
+  workflow_dispatch:
 
 jobs:
   build: