Merge branch 'main' of https://github.com/xwang2713/github-action-dev…

…-build into main
xwang2713 · Apr 8, 2024 · c48b949 · c48b949
2 parents c1ee535 + d64c532
commit c48b949
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/build-ce-platform.yml b/.github/workflows/build-ce-platform.yml
@@ -5,8 +5,8 @@ env:
   VCPKG_NUGET_REPOSITORY: "https://github.com/hpcc-systems/vcpkg"
 
 on:
-  workflow_dispatch
-  #push:
+  #workflow_dispatch
+  push:
 
 jobs:
   preamble:
@@ -64,9 +64,11 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: ubuntu-22.04
+          #- os: ubuntu-22.04
+          #- os: rockylinux-8
+          - os: centos-8
           #- os: centos-7
-          #  cmake_options_extra: "-DVCPKG_TARGET_TRIPLET=x64-centos-7-dynamic"
+            #cmake_options_extra: "-DVCPKG_TARGET_TRIPLET=x64-centos-7-dynamic"
       fail-fast: false
 
     steps:
@@ -150,11 +152,9 @@ jobs:
           sudo rm -rf ${{ needs.preamble.outputs.folder_build }}/CMakeFiles
 
           docker run --rm --mount ${{ needs.preamble.outputs.mount_platform }} --mount ${{ needs.preamble.outputs.mount_build }} ${{ steps.vars.outputs.docker_tag_candidate_base }} "${{ needs.preamble.outputs.gpg_import }} && \
-            cmake -S /hpcc-dev/HPCC-Platform -B /hpcc-dev/build ${{ needs.preamble.outputs.cmake_docker_config }} -DSIGN_MODULES_PASSPHRASE=${{ secrets.SIGN_MODULES_PASSPHRASE }} -DSIGN_MODULES_KEYID=${{ secrets.SIGN_MODULES_KEYID }} -DINCLUDE_PLUGINS=ON -DCONTAINERIZED=ON -DSUPPRESS_REMBED=ON -DSUPPRESS_V8EMBED=ON -DSUPPRESS_SPARK=ON -DCPACK_STRIP_FILES=OFF ${{ matrix.cmake_options_extra }} && \
+            cmake -S /hpcc-dev/HPCC-Platform -B /hpcc-dev/build ${{ needs.preamble.outputs.cmake_docker_config }} -DSIGN_MODULES_PASSPHRASE=${{ secrets.SIGN_MODULES_PASSPHRASE }} -DSIGN_MODULES_KEYID=${{ secrets.SIGN_MODULES_KEYID }} -DPLATFORM=ON -DCONTAINERIZED=OFF -DCPACK_STRIP_FILES=OFF ${{ matrix.cmake_options_extra }} && \
+            yum install -y rpm-build.x86_64 && \
             cmake --build /hpcc-dev/build --parallel $(nproc) --target package"
-          #docker run --rm --mount ${{ needs.preamble.outputs.mount_platform }} --mount ${{ needs.preamble.outputs.mount_build }} ${{ steps.vars.outputs.docker_tag_candidate_base }} "${{ needs.preamble.outputs.gpg_import }} && \
-          #  cmake -S /hpcc-dev/HPCC-Platform -B /hpcc-dev/build ${{ needs.preamble.outputs.cmake_docker_config }} -DSIGN_MODULES_PASSPHRASE=${{ secrets.SIGN_MODULES_PASSPHRASE }} -DSIGN_MODULES_KEYID=${{ secrets.SIGN_MODULES_KEYID }} -DINCLUDE_PLUGINS=ON -DCONTAINERIZED=ON -DSUPPRESS_REMBED=ON -DSUPPRESS_V8EMBED=ON -DSUPPRESS_SPARK=ON -DCPACK_STRIP_FILES=ON ${{ matrix.cmake_options_extra }} && \
-          #  cmake --build /hpcc-dev/build --parallel $(nproc) --target package"
 
       - name: Upload Artifacts CE Platform
         uses: actions/upload-artifact@v4

diff --git a/.github/workflows/build-win-osx-ct.yml b/.github/workflows/build-win-osx-ct.yml
@@ -5,8 +5,8 @@ env:
   VCPKG_NUGET_REPOSITORY: "https://github.com/hpcc-systems/vcpkg"
 
 on:
-  #workflow_dispatch
-  push:
+  workflow_dispatch
+  #push:
 
 jobs:
   preamble: