ci/workflows: fix matrix generation

With recent changes matrix strategies added to conformance tests. Matrix is generated from action yaml files, which are currently pulled from PR which not exists. This fails the workflows. This commit fixes the issue by pulling from the main. Signed-off-by: Birol Bilgin <birol@cilium.io>
cilium · Jun 21, 2023 · 34aaeae · 34aaeae
1 parent d9b9e65
commit 34aaeae
Show file tree

Hide file tree

Showing 20 changed files with 40 additions and 40 deletions.
diff --git a/.github/workflows/conformance-aks-v1.11.yaml b/.github/workflows/conformance-aks-v1.11.yaml
@@ -175,10 +175,10 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - name: Checkout PR code
+      - name: Checkout main branch
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
-          ref: ${{ needs.setup-report.outputs.sha }}
+          ref: ${{ github.event.repository.default_branch }}
           persist-credentials: false
 
       - name: Convert YAML to JSON

diff --git a/.github/workflows/conformance-aks-v1.12.yaml b/.github/workflows/conformance-aks-v1.12.yaml
@@ -175,10 +175,10 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - name: Checkout PR code
+      - name: Checkout main branch
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
-          ref: ${{ needs.setup-report.outputs.sha }}
+          ref: ${{ github.event.repository.default_branch }}
           persist-credentials: false
 
       - name: Convert YAML to JSON

diff --git a/.github/workflows/conformance-aks-v1.13.yaml b/.github/workflows/conformance-aks-v1.13.yaml
@@ -175,10 +175,10 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - name: Checkout PR code
+      - name: Checkout main branch
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
-          ref: ${{ needs.setup-report.outputs.sha }}
+          ref: ${{ github.event.repository.default_branch }}
           persist-credentials: false
 
       - name: Convert YAML to JSON

diff --git a/.github/workflows/conformance-aks.yaml b/.github/workflows/conformance-aks.yaml
@@ -171,10 +171,10 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - name: Checkout PR code
+      - name: Checkout main branch
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
-          ref: ${{ needs.setup-report.outputs.sha }}
+          ref: ${{ github.event.repository.default_branch }}
           persist-credentials: false
 
       - name: Convert YAML to JSON

diff --git a/.github/workflows/conformance-aws-cni-v1.11.yaml b/.github/workflows/conformance-aws-cni-v1.11.yaml
@@ -174,10 +174,10 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - name: Checkout PR code
+      - name: Checkout main branch
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
-          ref: ${{ needs.setup-report.outputs.sha }}
+          ref: ${{ github.event.repository.default_branch }}
           persist-credentials: false
 
       - name: Convert YAML to JSON

diff --git a/.github/workflows/conformance-aws-cni-v1.12.yaml b/.github/workflows/conformance-aws-cni-v1.12.yaml
@@ -174,10 +174,10 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - name: Checkout PR code
+      - name: Checkout main branch
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
-          ref: ${{ needs.setup-report.outputs.sha }}
+          ref: ${{ github.event.repository.default_branch }}
           persist-credentials: false
 
       - name: Convert YAML to JSON

diff --git a/.github/workflows/conformance-aws-cni-v1.13.yaml b/.github/workflows/conformance-aws-cni-v1.13.yaml
@@ -174,10 +174,10 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - name: Checkout PR code
+      - name: Checkout main branch
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
-          ref: ${{ needs.setup-report.outputs.sha }}
+          ref: ${{ github.event.repository.default_branch }}
           persist-credentials: false
 
       - name: Convert YAML to JSON

diff --git a/.github/workflows/conformance-aws-cni.yaml b/.github/workflows/conformance-aws-cni.yaml
@@ -170,10 +170,10 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - name: Checkout PR code
+      - name: Checkout main branch
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
-          ref: ${{ needs.setup-report.outputs.sha }}
+          ref: ${{ github.event.repository.default_branch }}
           persist-credentials: false
 
       - name: Convert YAML to JSON

diff --git a/.github/workflows/conformance-eks-v1.11.yaml b/.github/workflows/conformance-eks-v1.11.yaml
@@ -174,10 +174,10 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - name: Checkout PR code
+      - name: Checkout main branch
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
-          ref: ${{ needs.setup-report.outputs.sha }}
+          ref: ${{ github.event.repository.default_branch }}
           persist-credentials: false
 
       - name: Convert YAML to JSON

diff --git a/.github/workflows/conformance-eks-v1.12.yaml b/.github/workflows/conformance-eks-v1.12.yaml
@@ -174,10 +174,10 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - name: Checkout PR code
+      - name: Checkout main branch
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
-          ref: ${{ needs.setup-report.outputs.sha }}
+          ref: ${{ github.event.repository.default_branch }}
           persist-credentials: false
 
       - name: Convert YAML to JSON

diff --git a/.github/workflows/conformance-eks-v1.13.yaml b/.github/workflows/conformance-eks-v1.13.yaml
@@ -174,10 +174,10 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - name: Checkout PR code
+      - name: Checkout main branch
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
-          ref: ${{ needs.setup-report.outputs.sha }}
+          ref: ${{ github.event.repository.default_branch }}
           persist-credentials: false
 
       - name: Convert YAML to JSON

diff --git a/.github/workflows/conformance-eks.yaml b/.github/workflows/conformance-eks.yaml
@@ -170,10 +170,10 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - name: Checkout PR code
+      - name: Checkout main branch
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
-          ref: ${{ needs.setup-report.outputs.sha }}
+          ref: ${{ github.event.repository.default_branch }}
           persist-credentials: false
 
       - name: Convert YAML to JSON

diff --git a/.github/workflows/conformance-externalworkloads-v1.11.yaml b/.github/workflows/conformance-externalworkloads-v1.11.yaml
@@ -175,10 +175,10 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - name: Checkout PR code
+      - name: Checkout main branch
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
-          ref: ${{ needs.setup-report.outputs.sha }}
+          ref: ${{ github.event.repository.default_branch }}
           persist-credentials: false
 
       - name: Convert YAML to JSON

diff --git a/.github/workflows/conformance-externalworkloads-v1.12.yaml b/.github/workflows/conformance-externalworkloads-v1.12.yaml
@@ -175,10 +175,10 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - name: Checkout PR code
+      - name: Checkout main branch
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
-          ref: ${{ needs.setup-report.outputs.sha }}
+          ref: ${{ github.event.repository.default_branch }}
           persist-credentials: false
 
       - name: Convert YAML to JSON

diff --git a/.github/workflows/conformance-externalworkloads-v1.13.yaml b/.github/workflows/conformance-externalworkloads-v1.13.yaml
@@ -175,10 +175,10 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - name: Checkout PR code
+      - name: Checkout main branch
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
-          ref: ${{ needs.setup-report.outputs.sha }}
+          ref: ${{ github.event.repository.default_branch }}
           persist-credentials: false
 
       - name: Convert YAML to JSON

diff --git a/.github/workflows/conformance-externalworkloads.yaml b/.github/workflows/conformance-externalworkloads.yaml
@@ -171,10 +171,10 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - name: Checkout PR code
+      - name: Checkout main branch
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
-          ref: ${{ needs.setup-report.outputs.sha }}
+          ref: ${{ github.event.repository.default_branch }}
           persist-credentials: false
 
       - name: Convert YAML to JSON

diff --git a/.github/workflows/conformance-gke-v1.11.yaml b/.github/workflows/conformance-gke-v1.11.yaml
@@ -173,10 +173,10 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - name: Checkout PR code
+      - name: Checkout main branch
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
-          ref: ${{ needs.setup-report.outputs.sha }}
+          ref: ${{ github.event.repository.default_branch }}
           persist-credentials: false
 
       - name: Convert YAML to JSON

diff --git a/.github/workflows/conformance-gke-v1.12.yaml b/.github/workflows/conformance-gke-v1.12.yaml
@@ -173,10 +173,10 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - name: Checkout PR code
+      - name: Checkout main branch
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
-          ref: ${{ needs.setup-report.outputs.sha }}
+          ref: ${{ github.event.repository.default_branch }}
           persist-credentials: false
 
       - name: Convert YAML to JSON

diff --git a/.github/workflows/conformance-gke-v1.13.yaml b/.github/workflows/conformance-gke-v1.13.yaml
@@ -173,10 +173,10 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - name: Checkout PR code
+      - name: Checkout main branch
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
-          ref: ${{ needs.setup-report.outputs.sha }}
+          ref: ${{ github.event.repository.default_branch }}
           persist-credentials: false
 
       - name: Convert YAML to JSON

diff --git a/.github/workflows/conformance-gke.yaml b/.github/workflows/conformance-gke.yaml
@@ -169,10 +169,10 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - name: Checkout PR code
+      - name: Checkout main branch
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
-          ref: ${{ needs.setup-report.outputs.sha }}
+          ref: ${{ github.event.repository.default_branch }}
           persist-credentials: false
 
       - name: Convert YAML to JSON