Merge pull request #19332 from Michael-Gardner/HPCC-33006

HPCC-33006 Include 20.04 k8 build logic community/internal Reviewed-by: Gordon Smith <[email protected]> Merged-by: Gavin Halliday <[email protected]>
hpcc-systems · Dec 3, 2024 · 200e6a0 · 200e6a0
2 parents 130a3a9 + 93b534a
commit 200e6a0
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/.github/workflows/build-assets.yml b/.github/workflows/build-assets.yml
@@ -91,15 +91,24 @@ jobs:
           - os: ubuntu-22.04
             name: k8s
             container: true
+            build-docker-image: true
           - os: ubuntu-22.04
             name: docs
             documentation: true
           - os: ubuntu-20.04
+          - os: ubuntu-20.04
+            name: k8s
+            container: true
           - os: rockylinux-8
           - os: ubuntu-22.04
             name: LN k8s
             ln: true
             container: true
+            build-docker-image: true
+          - os: ubuntu-20.04
+            name: LN k8s
+            ln: true
+            container: true
           - os: ubuntu-22.04
             name: LN
             ln: true
@@ -272,7 +281,7 @@ jobs:
             ${{ needs.preamble.outputs.folder_build }}/*.md5sum
 
       - name: Locate k8s deb file (community)
-        if: ${{ !matrix.ln && !matrix.ee && matrix.container && !matrix.documentation }}
+        if: ${{ !matrix.ln && !matrix.ee && matrix.container && !matrix.documentation && matrix.build-docker-image }}
         id: container
         run: |
           k8s_pkg_path=$(ls -t ${{ needs.preamble.outputs.folder_build }}/*64_k8s.deb 2>/dev/null | head -1)
@@ -282,7 +291,7 @@ jobs:
 
       - name: Create Docker Image (community)
         uses: docker/build-push-action@v5
-        if: ${{ !matrix.ln && !matrix.ee && matrix.container && !matrix.documentation }}
+        if: ${{ !matrix.ln && !matrix.ee && matrix.container && !matrix.documentation && matrix.build-docker-image }}
         with:
           builder: ${{ steps.buildx.outputs.name }}
           file: ${{ needs.preamble.outputs.folder_platform }}/dockerfiles/vcpkg/platform-core-${{ matrix.os }}/Dockerfile
@@ -345,7 +354,7 @@ jobs:
             cmake --build /hpcc-dev/build --parallel $(nproc) --target package"
 
       - name: Upload Assets to Jfrog (debian internal)
-        if: ${{ matrix.ln && !matrix.container && contains(matrix.os, 'ubuntu') && github.repository_owner == 'hpcc-systems'}}
+        if: ${{ matrix.ln && contains(matrix.os, 'ubuntu') && github.repository_owner == 'hpcc-systems'}}
         shell: bash
         run: |
           cd ${{ needs.preamble.outputs.folder_build }}
@@ -368,7 +377,7 @@ jobs:
           done
 
       - name: Locate k8s deb file (internal)
-        if: ${{ matrix.ln && matrix.container && !matrix.documentation }}
+        if: ${{ matrix.ln && matrix.container && !matrix.documentation && matrix.build-docker-image }}
         id: ln-container
         run: |
           k8s_pkg_path=$(ls -t ${{ needs.preamble.outputs.folder_build }}/*64_k8s.deb 2>/dev/null | head -1)
@@ -378,7 +387,7 @@ jobs:
 
       - name: Create Docker Image (internal)
         uses: docker/build-push-action@v5
-        if: ${{ matrix.ln && matrix.container && !matrix.documentation }}
+        if: ${{ matrix.ln && matrix.container && !matrix.documentation && matrix.build-docker-image }}
         with:
           builder: ${{ steps.buildx.outputs.name }}
           file: ${{ needs.preamble.outputs.folder_platform }}/dockerfiles/vcpkg/platform-core-${{ matrix.os }}/Dockerfile
@@ -393,7 +402,7 @@ jobs:
             type=registry,ref=hpccsystems/platform-core-${{ matrix.os }}:${{ needs.preamble.outputs.candidate_base_branch }}
 
       - name: JFrog Docker Push and Publish
-        if: ${{ matrix.ln && matrix.container && !matrix.documentation && github.repository_owner == 'hpcc-systems' }}
+        if: ${{ matrix.ln && matrix.container && !matrix.documentation && matrix.build-docker-image && github.repository_owner == 'hpcc-systems' }}
         run: |
           jf docker push ${{ secrets.JFROG_REGISTRY || 'dummy.io' }}/hpccpl-docker-local/platform-core-ln:${{ needs.preamble.outputs.hpcc_version }} --build-name=platform-core-ln --build-number=${{ needs.preamble.outputs.hpcc_version }} --project=hpccpl
           jf rt bp platform-core-ln ${{ needs.preamble.outputs.hpcc_version }} --project=hpccpl