skip

canonical · Dec 10, 2024 · 9c76fdb · 9c76fdb
1 parent 368479b
commit 9c76fdb
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -8,26 +8,6 @@ on:
         required: true
 
 jobs:
-  build:
-    name: Build charm
-    uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v21.0.0
-    strategy:
-      fail-fast: false
-      matrix:
-        charm:
-          - kfp-api
-          - kfp-metadata-writer
-          - kfp-persistence
-          - kfp-profile-controller
-          - kfp-schedwf
-          - kfp-ui
-          - kfp-viewer
-          - kfp-viz
-    with:
-      cache: ${{ github.event_name == 'pull_request' }}
-      charmcraft-snap-channel: 3.x/edge
-      path-to-charm-directory: ./charms/${{ matrix.charm }}
-
   lib-check:
     name: Check libraries
     strategy:
@@ -110,7 +90,6 @@ jobs:
   integration:
     name: Integration tests (microk8s)
     runs-on: ubuntu-20.04
-    needs: [build]
     strategy:
       fail-fast: false
       matrix:
@@ -162,7 +141,6 @@ jobs:
 #  test-bundle:
 #    name: Test the bundle
 #    runs-on: ubuntu-20.04
-#    needs: [build]
 #    strategy:
 #      fail-fast: false
 #      matrix:

diff --git a/.github/workflows/on_pull_request.yaml b/.github/workflows/on_pull_request.yaml
@@ -9,13 +9,35 @@ on:
 
 jobs:
 
+  build:
+    name: Build charms
+    uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v21.0.0
+    strategy:
+      fail-fast: false
+      matrix:
+        charm:
+          - kfp-api
+          - kfp-metadata-writer
+          - kfp-persistence
+          - kfp-profile-controller
+          - kfp-schedwf
+          - kfp-ui
+          - kfp-viewer
+          - kfp-viz
+    with:
+      cache: ${{ github.event_name == 'pull_request' }}
+      charmcraft-snap-channel: 3.x/edge
+      path-to-charm-directory: ./charms/${{ matrix.charm }}
+
   tests:
     name: Run Tests
+    needs: [build]
     uses: ./.github/workflows/integrate.yaml
     secrets: inherit
 
   # publish runs in parallel with tests, as we always publish in this situation
   publish-charm:
     name: Publish Charm
+    needs: [build]
     uses: ./.github/workflows/publish.yaml
     secrets: inherit