shift xeol job up to use built image

LabKey · Aug 8, 2023 · 873c136 · 873c136
1 parent c98cdca
commit 873c136
Showing 1 changed file with 7 additions and 14 deletions.
diff --git a/.github/workflows/dockle_xeol.yml b/.github/workflows/dockle_xeol.yml
@@ -11,15 +11,15 @@ on:
 
 jobs:
   dockle:
-    name: dockle
+    name: dockle/xeol
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
       - name: Build an image from Dockerfile
         run: |
           LABKEY_VERSION=HelloWorld make build
-      - name: Run dockle
+      - name: Run dockle on helloworld image
         uses: goodwithtech/[email protected]
         env:
           DOCKER_CONTENT_TRUST: 0
@@ -29,19 +29,12 @@ jobs:
           exit-code: '1'
           exit-level: 'warn'
           ignore: 'CIS-DI-0009,CIS-DI-0010'
-  xeol:
-    name: xeol
-    needs: dockle
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-      - name: xeol-dir
+      - name: Run xeol on helloworld image
         uses: noqcks/[email protected]
         with:
-          path: "."
-      - name: xeol-image
+          image: "labkey/community:helloworld"
+      - name: Run xeol on dir
         uses: noqcks/[email protected]
         with:
-          # created by 'dockle' job above
-          image: "labkey/community:helloworld"
+          path: "."
+