Merge pull request #18343 from GordonSmith/HPCC-31313-UBUNTU-22_04

Add support for Ubuntu 22.04, OSX 13 and rockylinux-8 Reviewed-by: Gavin Halliday <[email protected]> Merged-by: Gavin Halliday <[email protected]>
hpcc-systems · Mar 8, 2024 · db52e95 · db52e95
2 parents e30bb31 + 9efbb72
commit db52e95
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 2 deletions.
diff --git a/.github/workflows/build-vcpkg.yml b/.github/workflows/build-vcpkg.yml
@@ -6,8 +6,10 @@ on:
       os:
         type: choice
         options:
+          - 'ubuntu-24.04'
           - 'ubuntu-22.04'
           - 'ubuntu-20.04'
+          - 'rockylinux-8'
           - 'centos-8'
           - 'centos-7'
           - 'amazonlinux'
@@ -64,6 +66,13 @@ jobs:
       asset-name: 'docker-package'
     secrets: inherit
 
+  build-docker-ubuntu-24_04:
+    if: ${{ contains('pull_request,push', github.event_name) }}
+    uses: ./.github/workflows/build-docker.yml
+    with:
+      os: ubuntu-24.04
+    secrets: inherit
+
   build-docker-ubuntu-22_04:
     if: ${{ contains('pull_request,push', github.event_name) }}
     uses: ./.github/workflows/build-docker.yml
@@ -115,6 +124,13 @@ jobs:
       os: ubuntu-20.04
     secrets: inherit
 
+  build-docker-rockylinux-8:
+    if: ${{ contains('schedule,push', github.event_name) }}
+    uses: ./.github/workflows/build-docker.yml
+    with:
+      os: rockylinux-8
+    secrets: inherit
+
   build-docker-centos-8:
     if: ${{ contains('schedule,push', github.event_name) }}
     uses: ./.github/workflows/build-docker.yml
@@ -168,9 +184,18 @@ jobs:
       cmake-configuration-ex: '-T host=x64 -A x64 -DUSE_CPPUNIT=OFF -DCLIENTTOOLS_ONLY=ON -DINCLUDE_PLUGINS=OFF -DUSE_AZURE=OFF -DUSE_CASSANDRA=OFF -DUSE_JAVA=OFF -DUSE_OPENLDAP=OFF'
     secrets: inherit
 
-  build-gh_runner-macos-12:
+  build-gh_runner-macos-13:
     if: ${{ contains('pull_request,push', github.event_name) }}
     uses: ./.github/workflows/build-gh_runner.yml
+    with:
+      os: macos-13
+      build-type: 'Release'
+      cmake-configuration-ex: '-DUSE_CPPUNIT=OFF -DCLIENTTOOLS_ONLY=ON -DINCLUDE_PLUGINS=OFF -DUSE_AZURE=OFF -DUSE_CASSANDRA=OFF -DSUPPRESS_CASSANDRAEMBED=ON -DUSE_JAVA=OFF -DUSE_OPENLDAP=OFF'
+    secrets: inherit
+
+  build-gh_runner-macos-12:
+    if: ${{ contains('schedule,push', github.event_name) }}
+    uses: ./.github/workflows/build-gh_runner.yml
     with:
       os: macos-12
       build-type: 'Release'

diff --git a/dockerfiles/vcpkg/build.sh b/dockerfiles/vcpkg/build.sh
@@ -65,10 +65,11 @@ function doBuild() {
 }
 
 # doBuild ubuntu-20.04
+# doBuild rockylinux-8 &
 # doBuild amazonlinux
 # doBuild ubuntu-22.04
 # doBuild centos-8
-doBuild centos-7
+# doBuild centos-7
 
 wait
 

diff --git a/dockerfiles/vcpkg/rockylinux-8.dockerfile b/dockerfiles/vcpkg/rockylinux-8.dockerfile
@@ -0,0 +1,6 @@
+ARG VCPKG_REF=latest
+FROM hpccsystems/platform-build-base-rockylinux-8:$VCPKG_REF
+
+ENTRYPOINT ["/bin/bash", "--login", "-c"]
+
+CMD ["/bin/bash"]
diff --git a/dockerfiles/vcpkg/ubuntu-24.04.dockerfile b/dockerfiles/vcpkg/ubuntu-24.04.dockerfile
@@ -0,0 +1,6 @@
+ARG VCPKG_REF=latest
+FROM hpccsystems/platform-build-base-ubuntu-24.04:$VCPKG_REF
+
+ENTRYPOINT ["/bin/bash", "--login", "-c"]
+
+CMD ["/bin/bash"]