do it

ocpdude · Jan 31, 2024 · f03cd05 · f03cd05
1 parent e53ad8c
commit f03cd05
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 31 deletions.
diff --git a/.github/workflows/docker-custom-runner.yaml b/.github/workflows/docker-custom-runner.yaml
@@ -20,18 +20,16 @@ env:
 
 jobs:
 
-  docker-linter:
-    uses: ocpdude/reusable/.github/workflows/linter.yaml@main
-    with:
-      language: hadolint
+  super-linter:
+    uses: .github/workflows/super-linter.yaml@main
 
   security-checks:
     permissions:
       contents: read
       security-events: write
       actions: read
     runs-on: ubuntu-latest
-    needs: [ docker-linter ]
+    needs: [ super-linter ]
     steps:
       - uses: actions/checkout@v4
       - name: Build the test image
@@ -50,7 +48,7 @@ jobs:
           sarif_file: ${{ steps.scan.outputs.sarif }}
 
   build-deployment:
-    needs: [ security-checks, docker-linter ]
+    needs: [ security-checks, super-linter ]
     runs-on: ubuntu-latest
     steps:
       - name: Get the date

diff --git a/.github/workflows/podman-custom-runner.yaml b/.github/workflows/podman-custom-runner.yaml
@@ -6,12 +6,11 @@ on:
       - main
     paths:
       - 'openshift/builds/podman/Dockerfile'
-
   pull_request:
-      branches:
-        - 'main'
-      paths: 
-        - 'openshift/builds/podman/Dockerfile'
+    branches:
+      - 'main'
+    paths: 
+      - 'openshift/builds/podman/Dockerfile'
 
   workflow_dispatch:
 
@@ -20,18 +19,12 @@ env:
 
 jobs:
 
-  docker-linter:
-    uses: ocpdude/reusable/.github/workflows/linter.yaml@main
-    with:
-      language: hadolint
-
   security-checks:
     permissions:
       contents: read
       security-events: write
       actions: read
     runs-on: ubuntu-latest
-    needs: [ docker-linter ]
     steps:
       - uses: actions/checkout@v4
       - name: Build the test image
@@ -50,7 +43,7 @@ jobs:
           sarif_file: ${{ steps.scan.outputs.sarif }}
 
   build-deployment:
-    needs: [ security-checks, docker-linter ]
+    needs: [ security-checks ]
     runs-on: ubuntu-latest
     steps:
       - name: Get the date

diff --git a/.github/workflows/super-linter.yaml b/.github/workflows/super-linter.yaml
@@ -1,20 +1,18 @@
 name: Code Linter
 
 on:
-  # push:
-  #   branches:
-  #     - main
-  pull_request:
-      branches:
-        - 'main'
-      paths: 
-        - 'openshift/manifests/org-ocpdude/**.yaml'
-        - 'openshift/manifests/org-vault-tec/**.yaml'
-        - 'openshift/manifests/rbac-example/**.yaml'
-        - 'openshift/builds/podman/Dockerfile'
-        - 'openshift/builds/docker/Dockerfile'
-
+  workflow_call: 
   workflow_dispatch:
+  pull_request:
+    branches:
+      - 'main'
+    paths: 
+      - 'openshift/manifests/org-ocpdude/**.yaml'
+      - 'openshift/manifests/org-vault-tec/**.yaml'
+      - 'openshift/manifests/rbac-example/**.yaml'
+      - 'openshift/builds/podman/Dockerfile'
+      - 'openshift/builds/docker/Dockerfile'
+
 
 jobs:
   build: