fixup! check out repo in new steps, ensure background smoketest is cl…

…eaned up
andrewazores · Mar 19, 2024 · 7b945a4 · 7b945a4
1 parent 9e6dfa0
commit 7b945a4
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/.github/workflows/pr-ci.yaml b/.github/workflows/pr-ci.yaml
@@ -199,16 +199,16 @@ jobs:
     - uses: actions/download-artifact@v3
       with:
         name: cryostat
+    - name: Load cryostat image
+      run: podman load -i cryostat.tar
+    - name: Tag cryostat image
+      run: podman tag cryostat ghcr.io/${{ github.repository_owner }}/cryostat:latest-schema
     - uses: actions/checkout@v3
       with:
         repository: ${{ needs.checkout-branch.outputs.PR_repo }}
         ref: ${{ needs.checkout-branch.outputs.PR_head_ref }}
         submodules: true
         fetch-depth: 0
-    - name: Load cryostat image
-      run: podman load -i cryostat.tar
-    - name: Tag cryostat image
-      run: podman tag cryostat ghcr.io/${{ github.repository_owner }}/cryostat:latest-schema
     - name: Compare schemas
       run: |
         CRYOSTAT_IMAGE=ghcr.io/${{ github.repository_owner }}/cryostat:latest-schema ./smoketest.bash -Op &
@@ -230,30 +230,30 @@ jobs:
     needs: [checkout-branch, retrieve-schemas]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/download-artifact@v3
-      with:
-        name: openapi-schema
     - uses: actions/checkout@v3
       with:
         repository: ${{ needs.checkout-branch.outputs.PR_repo }}
         ref: ${{ needs.checkout-branch.outputs.PR_head_ref }}
         submodules: true
         fetch-depth: 0
+    - uses: actions/download-artifact@v3
+      with:
+        name: openapi-schema
     - name: Check schema for changes
       run: diff schema/openapi.json openapi-schema
 
   compare-graphql-schema:
     needs: [checkout-branch, retrieve-schemas]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/download-artifact@v3
-      with:
-        name: graphql-schema
     - uses: actions/checkout@v3
       with:
         repository: ${{ needs.checkout-branch.outputs.PR_repo }}
         ref: ${{ needs.checkout-branch.outputs.PR_head_ref }}
         submodules: true
         fetch-depth: 0
+    - uses: actions/download-artifact@v3
+      with:
+        name: graphql-schema
     - name: Check schema for changes
       run: diff schema/schema.graphql graphql-schema