Merge branch 'main' into main

MrMeoMeo-Dev · Aug 1, 2024 · 4f23ad3 · 4f23ad3
2 parents 81a51b8 + 7fc34f2
commit 4f23ad3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/labeler-triage.yml b/.github/workflows/labeler-triage.yml
@@ -5,12 +5,12 @@ permissions:
   pull-requests: write
 
 on:
-- pull_request_target
+  pull_request_target:
 
 jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@v4
+    - uses: actions/labeler@v5
       with:
-        repo-token: "${{ secrets.GITHUB_TOKEN }}"
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/deployments/openshift.yml b/deployments/openshift.yml
@@ -67,11 +67,11 @@ jobs:
   # TODO: Make sure to add 'CRDA Scan' starter workflow from the 'Actions' tab.
   # For guide on adding new starter workflow visit https://docs.github.com/en/github-ae@latest/actions/using-workflows/using-starter-workflows
 
-  crda-scan:
-    uses: ./.github/workflows/crda.yml
-    secrets:
-      CRDA_KEY: ${{ secrets.CRDA_KEY }}
-      # SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}       # Either use SNYK_TOKEN or CRDA_KEY
+  #crda-scan:
+  #  uses: ./.github/workflows/crda.yml
+  #  secrets:
+  #    CRDA_KEY: ${{ secrets.CRDA_KEY }}
+  #    # SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}       # Either use SNYK_TOKEN or CRDA_KEY
 
   openshift-ci-cd:
     # 🖊️ Uncomment this if you are using CRDA scan step above