ci: adjust workflow defaults

semgr8ns · Feb 4, 2024 · 91fa628 · 91fa628
1 parent 8189484
commit 91fa628
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 5 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -5,7 +5,6 @@ name: pr
 on:
   pull_request:
     branches:
-      - main
       - dev
 
 defaults:
@@ -22,8 +21,8 @@ jobs:
       skip_build: 'none'
       skip_compliance_checks: 'none'
       skip_unit_tests: 'all'
-      skip_sast: 'none'
-      skip_sca: 'none'
+      skip_sast: 'non-required'
+      skip_sca: 'non-required'
       skip_docs: 'non-required'
       skip_integration_tests: 'non-required'
       output_type: 'sarif'
diff --git a/.github/workflows/pr2main.yml b/.github/workflows/pr2main.yml
@@ -0,0 +1,28 @@
+name: pr
+
+#permissions: {}  #TODO: reactivate for non-private
+
+on:
+  pull_request:
+    branches:
+      - main
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  ci:
+    uses: ./.github/workflows/.reusable-ci.yml
+    #    permissions:  #TODO: adjust for non-private
+    secrets: inherit
+    with:
+      #TODO: adjust for non private
+      skip_build: 'none'
+      skip_compliance_checks: 'none'
+      skip_unit_tests: 'all'
+      skip_sast: 'none'
+      skip_sca: 'none'
+      skip_docs: 'non-required'
+      skip_integration_tests: 'none'
+      output_type: 'sarif'
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -22,8 +22,8 @@ jobs:
       skip_build: 'none'
       skip_compliance_checks: 'none'
       skip_unit_tests: 'all'
-      skip_sast: 'non-required'
-      skip_sca: 'non-required'
+      skip_sast: 'none'
+      skip_sca: 'none'
       skip_docs: 'none'
       skip_integration_tests: 'none'
       output_type: 'sarif'