Fix actions - hopefully

substratusai · Aug 22, 2023 · d2c13d9 · d2c13d9
1 parent a3dd50c
commit d2c13d9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -6,7 +6,7 @@ on:
       - main
     tags:
       - "v*.*.*"
-  merge_group:
+  pull_request:
 jobs:
   controller:
     runs-on: ubuntu-latest
@@ -18,7 +18,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
       - name: Login to Docker Hub
-        if: github.event_name != 'merge_group'
+        if: github.event_name != 'pull_request'
         uses: docker/login-action@v2
         with:
           username: "${{ secrets.DOCKERHUB_USERNAME }}"
@@ -34,7 +34,7 @@ jobs:
         with:
           context: .
           platforms: "linux/amd64,linux/arm64"
-          push: ${{ github.event_name != 'merge_group' }}
+          push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta-controller-manager.outputs.tags }}
           labels: ${{ steps.meta-controller-manager.outputs.labels }}
   sci-gcp:
@@ -47,7 +47,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
       - name: Login to Docker Hub
-        if: github.event_name != 'merge_group'
+        if: github.event_name != 'pull_request'
         uses: docker/login-action@v2
         with:
           username: "${{ secrets.DOCKERHUB_USERNAME }}"
@@ -64,7 +64,7 @@ jobs:
           context: .
           file: Dockerfile.sci-gcp
           platforms: "linux/amd64,linux/arm64"
-          push: ${{ github.event_name != 'merge_group' }}
+          push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
   sci-kind:
@@ -77,7 +77,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
       - name: Login to Docker Hub
-        if: github.event_name != 'merge_group'
+        if: github.event_name != 'pull_request'
         uses: docker/login-action@v2
         with:
           username: "${{ secrets.DOCKERHUB_USERNAME }}"
@@ -94,6 +94,6 @@ jobs:
           context: .
           file: Dockerfile.sci-kind
           platforms: "linux/amd64,linux/arm64"
-          push: ${{ github.event_name != 'merge_group' }}
+          push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -2,7 +2,6 @@ name: Integration tests
 run-name: ${{ github.actor }} triggered integration tests 🚀
 on:
   pull_request:
-  merge_group:
 jobs:
   integration-tests:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/system-tests.yml b/.github/workflows/system-tests.yml
@@ -7,7 +7,7 @@ on:
       # Should run before a release.
       - main
   workflow_run:
-    workflows: [Run Tests]
+    workflows: [Docker pipeline]
     types:
       - completed
 jobs: