consolidate image generation matrices (#5815)

nginx · Jun 21, 2024 · d073aa6 · d073aa6
1 parent 0bb061c
commit d073aa6
Show file tree

Hide file tree

Showing 8 changed files with 161 additions and 243 deletions.
diff --git a/.github/data/matrix-images-nap.json b/.github/data/matrix-images-nap.json
@@ -0,0 +1,85 @@
+{
+  "image": [
+    "debian-plus-nap"
+  ],
+  "platforms": [
+    "linux/amd64"
+  ],
+  "target": [
+    "goreleaser",
+    "aws"
+  ],
+  "nap_modules": [
+    "dos",
+    "waf",
+    "waf,dos"
+  ],
+  "include": [
+    {
+      "image": "ubi-9-plus-nap",
+      "target": "goreleaser",
+      "platforms": "linux/amd64",
+      "nap_modules": "waf"
+    },
+    {
+      "image": "ubi-8-plus-nap",
+      "target": "goreleaser",
+      "platforms": "linux/amd64",
+      "nap_modules": "dos"
+    },
+    {
+      "image": "ubi-8-plus-nap",
+      "target": "goreleaser",
+      "platforms": "linux/amd64",
+      "nap_modules": "waf,dos"
+    },
+    {
+      "image": "ubi-9-plus-nap",
+      "target": "aws",
+      "platforms": "linux/amd64",
+      "nap_modules": "waf"
+    },
+    {
+      "image": "ubi-8-plus-nap",
+      "target": "aws",
+      "platforms": "linux/amd64",
+      "nap_modules": "dos"
+    },
+    {
+      "image": "ubi-8-plus-nap",
+      "target": "aws",
+      "platforms": "linux/amd64",
+      "nap_modules": "waf,dos"
+    },
+    {
+      "image": "alpine-plus-nap-fips",
+      "target": "goreleaser",
+      "platforms": "linux/amd64",
+      "nap_modules": "waf"
+    },
+    {
+      "image": "alpine-plus-nap-v5-fips",
+      "target": "goreleaser",
+      "platforms": "linux/amd64",
+      "nap_modules": "waf"
+    },
+    {
+      "image": "debian-plus-nap-v5",
+      "target": "goreleaser",
+      "platforms": "linux/amd64",
+      "nap_modules": "waf"
+    },
+    {
+      "image": "ubi-9-plus-nap-v5",
+      "target": "goreleaser",
+      "platforms": "linux/amd64",
+      "nap_modules": "waf"
+    },
+    {
+      "image": "ubi-8-plus-nap-v5",
+      "target": "goreleaser",
+      "platforms": "linux/amd64",
+      "nap_modules": "waf"
+    }
+  ]
+}
diff --git a/.github/data/matrix-images-oss.json b/.github/data/matrix-images-oss.json
@@ -0,0 +1,15 @@
+{
+  "image": [
+    "debian",
+    "alpine"
+  ],
+  "platforms": [
+    "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
+  ],
+  "include": [
+    {
+      "image": "ubi",
+      "platforms": "linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
+    }
+  ]
+}
diff --git a/.github/data/matrix-images-plus.json b/.github/data/matrix-images-plus.json
@@ -0,0 +1,21 @@
+{
+  "image": [
+    "debian-plus",
+    "alpine-plus",
+    "alpine-plus-fips"
+  ],
+  "platforms": [
+    "linux/arm64, linux/amd64"
+  ],
+  "target": [
+    "goreleaser",
+    "aws"
+  ],
+  "include": [
+    {
+      "image": "ubi-plus",
+      "platforms": "linux/arm64, linux/amd64, linux/s390x",
+      "target": "goreleaser"
+    }
+  ]
+}
diff --git a/.github/workflows/build-base-images.yml b/.github/workflows/build-base-images.yml
@@ -25,6 +25,9 @@ jobs:
     outputs:
       docker_md5: ${{ steps.vars.outputs.docker_md5 }}
       ic_version: ${{ steps.vars.outputs.ic_version }}
+      image_matrix_oss: ${{ steps.vars.outputs.image_matrix_oss }}
+      image_matrix_plus: ${{ steps.vars.outputs.image_matrix_plus }}
+      image_matrix_nap: ${{ steps.vars.outputs.image_matrix_nap }}
     steps:
       - name: Checkout Repository
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
@@ -35,6 +38,9 @@ jobs:
           ./.github/scripts/variables.sh docker_md5 >> $GITHUB_OUTPUT
           source .github/data/version.txt
           echo "ic_version=${IC_VERSION}" >> $GITHUB_OUTPUT
+          echo "image_matrix_oss=$(cat .github/data/matrix-images-oss.json | jq -c)" >> $GITHUB_OUTPUT
+          echo "image_matrix_plus=$(cat .github/data/matrix-images-plus.json | jq -c)" >> $GITHUB_OUTPUT
+          echo "image_matrix_nap=$(cat .github/data/matrix-images-nap.json | jq -c)" >> $GITHUB_OUTPUT
           cat $GITHUB_OUTPUT
 
   build-oss:
@@ -46,13 +52,7 @@ jobs:
       pull-requests: write # for scout report
     strategy:
       fail-fast: false
-      matrix:
-        image: [debian, alpine]
-        platforms:
-          ["linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"]
-        include:
-          - image: ubi
-            platforms: "linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
+      matrix: ${{ fromJSON( needs.checks.outputs.image_matrix_oss ) }}
     steps:
       - name: Checkout Repository
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
@@ -116,12 +116,7 @@ jobs:
       pull-requests: write # for scout report
     strategy:
       fail-fast: false
-      matrix:
-        image: [debian-plus, alpine-plus, alpine-plus-fips]
-        platforms: ["linux/arm64, linux/amd64"]
-        include:
-          - image: ubi-plus
-            platforms: "linux/arm64, linux/amd64, linux/s390x"
+      matrix: ${{ fromJSON( needs.checks.outputs.image_matrix_plus ) }}
     steps:
       - name: Checkout Repository
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
@@ -188,39 +183,7 @@ jobs:
       pull-requests: write # for scout report
     strategy:
       fail-fast: false
-      matrix:
-        image: [debian-plus-nap]
-        platforms: ["linux/amd64"]
-        nap_modules: [dos, waf, "waf,dos"]
-        include:
-          - image: ubi-9-plus-nap
-            platforms: "linux/amd64"
-            nap_modules: waf
-          - image: ubi-8-plus-nap
-            platforms: "linux/amd64"
-            nap_modules: dos
-          - image: ubi-8-plus-nap
-            platforms: "linux/amd64"
-            nap_modules: "waf,dos"
-          - image: alpine-plus-nap-fips
-            platforms: "linux/amd64"
-            nap_modules: waf
-          - image: alpine-plus-nap-v5-fips
-            target: goreleaser
-            platforms: "linux/amd64"
-            nap_modules: waf
-          - image: debian-plus-nap-v5
-            target: goreleaser
-            platforms: "linux/amd64"
-            nap_modules: waf
-          - image: ubi-9-plus-nap-v5
-            target: goreleaser
-            platforms: "linux/amd64"
-            nap_modules: waf
-          - image: ubi-8-plus-nap-v5
-            target: goreleaser
-            platforms: "linux/amd64"
-            nap_modules: waf
+      matrix: ${{ fromJSON( needs.checks.outputs.image_matrix_nap ) }}
     steps:
       - name: Checkout Repository
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

diff --git a/.github/workflows/build-oss.yml b/.github/workflows/build-oss.yml
@@ -210,7 +210,7 @@ jobs:
           summary: true
         if: ${{ inputs.authenticated && steps.build-push.conclusion == 'success' }}
 
-      - name: Upload Scan Results to the cache
+      - name: Upload Scan Results to Github Artifacts
         uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
         continue-on-error: true
         with:

diff --git a/.github/workflows/cache-update.yml b/.github/workflows/cache-update.yml
@@ -21,6 +21,9 @@ jobs:
     outputs:
       go_code_md5: ${{ steps.vars.outputs.go_code_md5 }}
       docker_md5: ${{ steps.vars.outputs.docker_md5 }}
+      image_matrix_oss: ${{ steps.vars.outputs.image_matrix_oss }}
+      image_matrix_plus: ${{ steps.vars.outputs.image_matrix_plus }}
+      image_matrix_nap: ${{ steps.vars.outputs.image_matrix_nap }}
     steps:
       - name: Checkout Repository
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
@@ -30,21 +33,17 @@ jobs:
         run: |
           ./.github/scripts/variables.sh go_code_md5 >> $GITHUB_OUTPUT
           ./.github/scripts/variables.sh docker_md5 >> $GITHUB_OUTPUT
-          source .github/data/version.txt
+          echo "image_matrix_oss=$(cat .github/data/matrix-images-oss.json | jq -c)" >> $GITHUB_OUTPUT
+          echo "image_matrix_plus=$(cat .github/data/matrix-images-plus.json | jq -c)" >> $GITHUB_OUTPUT
+          echo "image_matrix_nap=$(cat .github/data/matrix-images-nap.json | jq -c)" >> $GITHUB_OUTPUT
           cat $GITHUB_OUTPUT
 
   build-docker:
     name: Build Docker OSS
     needs: [checks]
     strategy:
       fail-fast: false
-      matrix:
-        image: [debian, alpine]
-        platforms:
-          ["linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"]
-        include:
-          - image: ubi
-            platforms: "linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
+      matrix: ${{ fromJSON( needs.checks.outputs.image_matrix_oss ) }}
     uses: ./.github/workflows/build-oss.yml
     with:
       platforms: ${{ matrix.platforms }}
@@ -68,14 +67,7 @@ jobs:
     needs: [checks]
     strategy:
       fail-fast: false
-      matrix:
-        image: [debian-plus, alpine-plus, alpine-plus-fips]
-        platforms: ["linux/arm64, linux/amd64"]
-        target: [goreleaser, aws]
-        include:
-          - image: ubi-plus
-            platforms: "linux/arm64, linux/amd64, linux/s390x"
-            target: goreleaser
+      matrix: ${{ fromJSON( needs.checks.outputs.image_matrix_plus ) }}
     uses: ./.github/workflows/build-plus.yml
     with:
       platforms: ${{ matrix.platforms }}
@@ -98,56 +90,7 @@ jobs:
     needs: [checks]
     strategy:
       fail-fast: false
-      matrix:
-        image: [debian-plus-nap]
-        platforms: ["linux/amd64"]
-        target: [goreleaser, aws]
-        nap_modules: [dos, waf, "waf,dos"]
-        include:
-          - image: ubi-9-plus-nap
-            target: goreleaser
-            platforms: "linux/amd64"
-            nap_modules: waf
-          - image: ubi-8-plus-nap
-            target: goreleaser
-            platforms: "linux/amd64"
-            nap_modules: dos
-          - image: ubi-8-plus-nap
-            target: goreleaser
-            platforms: "linux/amd64"
-            nap_modules: "waf,dos"
-          - image: ubi-9-plus-nap
-            target: aws
-            platforms: "linux/amd64"
-            nap_modules: waf
-          - image: ubi-8-plus-nap
-            target: aws
-            platforms: "linux/amd64"
-            nap_modules: dos
-          - image: ubi-8-plus-nap
-            target: aws
-            platforms: "linux/amd64"
-            nap_modules: "waf,dos"
-          - image: alpine-plus-nap-fips
-            target: goreleaser
-            platforms: "linux/amd64"
-            nap_modules: waf
-          - image: alpine-plus-nap-v5-fips
-            target: goreleaser
-            platforms: "linux/amd64"
-            nap_modules: waf
-          - image: debian-plus-nap-v5
-            target: goreleaser
-            platforms: "linux/amd64"
-            nap_modules: waf
-          - image: ubi-9-plus-nap-v5
-            target: goreleaser
-            platforms: "linux/amd64"
-            nap_modules: waf
-          - image: ubi-8-plus-nap-v5
-            target: goreleaser
-            platforms: "linux/amd64"
-            nap_modules: waf
+      matrix: ${{ fromJSON( needs.checks.outputs.image_matrix_nap ) }}
     uses: ./.github/workflows/build-plus.yml
     with:
       platforms: ${{ matrix.platforms }}