Skip to content

Commit a1883ec

Browse files
authored
Merge branch 'main' into main
2 parents 533ff44 + 577b87c commit a1883ec

File tree

8 files changed

+950
-51
lines changed

8 files changed

+950
-51
lines changed

.github/workflows/build-ce-platform.yml

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ jobs:
1212
preamble:
1313
name: Publish Release
1414
env:
15-
COMMUNITY_REF: "dc1cdacdbdda6e5ca1c5b836e130c2deb2d2fe62"
15+
COMMUNITY_REF: "089328a11a11bf9e8c4f7d0264d7915f33b0ca57"
1616
#COMMUNITY_REF: <GIT REF>
17+
GITHUB_ACCOUNT: ${{ github.repository_owner }}
1718
runs-on: ubuntu-22.04
1819
permissions:
1920
contents: write
@@ -29,6 +30,7 @@ jobs:
2930
candidate_branch: ${{ steps.vars.outputs.candidate_branch }}
3031
cmake_docker_config: ${{ steps.vars.outputs.cmake_docker_config }}
3132
gpg_import: ${{ steps.vars.outputs.gpg_import }}
33+
github_account: ${{ steps.vars.outputs.github_account }}
3234
steps:
3335
- name: Calculate vars
3436
id: vars
@@ -46,7 +48,7 @@ jobs:
4648
candidate_branch=$(echo $community_base_ref | cut -d'/' -f3)
4749
echo "candidate_branch=$candidate_branch" >> $GITHUB_OUTPUT
4850
echo "candidate_base_branch=$(echo $candidate_branch | awk -F'.' -v OFS='.' '{ $3="x"; print }')" >> $GITHUB_OUTPUT
49-
echo "cmake_docker_config=-DCMAKE_BUILD_TYPE=RelWithDebInfo -DVCPKG_FILES_DIR=/hpcc-dev -DCPACK_THREADS=0 -DUSE_OPTIONAL=OFF -DSIGN_MODULES=${{ github.repository_owner == 'hpcc-systems' && 'ON' || 'OFF' }}" >> $GITHUB_OUTPUT
51+
echo "cmake_docker_config=-DCMAKE_BUILD_TYPE=RelWithDebInfo -DVCPKG_FILES_DIR=/hpcc-dev -DCPACK_THREADS=0 -DUSE_OPTIONAL=OFF -DSIGN_MODULES=${{ env.GITHUB_ACCOUNT == 'hpcc-systems' && 'ON' || 'OFF' }}" >> $GITHUB_OUTPUT
5052
echo 'gpg_import=gpg --batch --import /hpcc-dev/build/private.key' >> $GITHUB_OUTPUT
5153
5254
- name: Print vars
@@ -60,9 +62,12 @@ jobs:
6062
strategy:
6163
matrix:
6264
include:
63-
- os: ubuntu-22.04
65+
- os: ubuntu-24.04
66+
#- os: ubuntu-22.04
67+
#- os: rockylinux-8
68+
#- os: centos-8
6469
#- os: centos-7
65-
# cmake_options_extra: "-DVCPKG_TARGET_TRIPLET=x64-centos-7-dynamic"
70+
#cmake_options_extra: "-DVCPKG_TARGET_TRIPLET=x64-centos-7-dynamic"
6671
fail-fast: false
6772

6873
steps:
@@ -87,7 +92,7 @@ jobs:
8792
- name: Checkout HPCC-Platform
8893
uses: actions/checkout@v3
8994
with:
90-
repository: ${{ github.repository_owner }}/HPCC-Platform
95+
repository: ${{ needs.preamble.outputs.github_account }}/HPCC-Platform
9196
ref: ${{ needs.preamble.outputs.community_ref }}
9297
submodules: recursive
9398
path: ${{ needs.preamble.outputs.folder_platform }}
@@ -124,8 +129,9 @@ jobs:
124129
builder: ${{ steps.buildx.outputs.name }}
125130
file: ${{ needs.preamble.outputs.folder_platform }}/dockerfiles/vcpkg/${{ matrix.os }}.dockerfile
126131
context: ${{ needs.preamble.outputs.folder_platform }}/dockerfiles/vcpkg
127-
push: ${{ github.repository_owner == 'hpcc-systems' }}
128-
load: ${{ github.repository_owner != 'hpcc-systems' }}
132+
133+
push: ${{ needs.preamble.outputs.github_account == 'hpcc-systems' }}
134+
load: ${{ needs.preamble.outputs.github_account != 'hpcc-systems' }}
129135
build-args: |
130136
VCPKG_REF=${{ steps.vars.outputs.vcpkg_sha_short }}
131137
tags: |
@@ -139,23 +145,22 @@ jobs:
139145
- name: CMake Packages (community)
140146
if: ${{ !matrix.ln && !matrix.ee && !matrix.container && !matrix.documentation }}
141147
run: |
148+
echo "gcc packages installed"
149+
sudo rpm -qa
142150
mkdir -p ${{needs.preamble.outputs.folder_build }}
143151
echo "${{ secrets.SIGNING_SECRET }}" > ${{ needs.preamble.outputs.folder_build }}/private.key
144152
145153
sudo rm -f ${{ needs.preamble.outputs.folder_build }}/CMakeCache.txt
146154
sudo rm -rf ${{ needs.preamble.outputs.folder_build }}/CMakeFiles
147155
148156
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 }} && \
149-
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 }} && \
157+
cmake -S /hpcc-dev/HPCC-Platform -B /hpcc-dev/build -DVCPKG_FILES_DIR=/hpcc-dev ${{ 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 }} && \
150158
cmake --build /hpcc-dev/build --parallel $(nproc) --target package"
151-
#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 }} && \
152-
# 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 }} && \
153-
# cmake --build /hpcc-dev/build --parallel $(nproc) --target package"
154159
155160
- name: Upload Artifacts CE Platform
156161
uses: actions/upload-artifact@v4
157162
with:
158-
name: CE-HPCC-Platform
163+
name: CE-HPCC-Platform-${{ matrix.os }}
159164
path: |
160165
${{ needs.preamble.outputs.folder_build }}/*.deb
161166
${{ needs.preamble.outputs.folder_build }}/*.rpm

.github/workflows/build-ce-plugins.yml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ jobs:
1212
preamble:
1313
name: Publish Release
1414
env:
15-
COMMUNITY_REF: "dc1cdacdbdda6e5ca1c5b836e130c2deb2d2fe62"
15+
COMMUNITY_REF: "4551e629c308a5a77c4a7c05c36b8219e86ab4a9"
1616
#COMMUNITY_REF: <GIT REF>
17+
GITHUB_ACCOUNT: ${{ github.repository_owner }}
1718
runs-on: ubuntu-22.04
1819
permissions:
1920
contents: write
@@ -29,10 +30,14 @@ jobs:
2930
candidate_branch: ${{ steps.vars.outputs.candidate_branch }}
3031
cmake_docker_config: ${{ steps.vars.outputs.cmake_docker_config }}
3132
gpg_import: ${{ steps.vars.outputs.gpg_import }}
33+
github_account: ${{ steps.vars.outputs.github_account }}
3234
steps:
3335
- name: Calculate vars
3436
id: vars
3537
run: |
38+
github_account=${{ env.GITHUB_ACCOUNT }}
39+
echo "github_account=$github_account" >> $GITHUB_OUTPUT
40+
echo "folder_platform=${{ github.workspace }}/HPCC-Platform" >> $GITHUB_OUTPUT
3641
echo "folder_platform=${{ github.workspace }}/HPCC-Platform" >> $GITHUB_OUTPUT
3742
echo 'mount_platform=source="${{ github.workspace }}/HPCC-Platform",target=/hpcc-dev/HPCC-Platform,type=bind,consistency=cached' >> $GITHUB_OUTPUT
3843
echo "folder_build=${{ github.workspace }}/build" >> $GITHUB_OUTPUT
@@ -46,7 +51,7 @@ jobs:
4651
candidate_branch=$(echo $community_base_ref | cut -d'/' -f3)
4752
echo "candidate_branch=$candidate_branch" >> $GITHUB_OUTPUT
4853
echo "candidate_base_branch=$(echo $candidate_branch | awk -F'.' -v OFS='.' '{ $3="x"; print }')" >> $GITHUB_OUTPUT
49-
echo "cmake_docker_config=-DCMAKE_BUILD_TYPE=RelWithDebInfo -DVCPKG_FILES_DIR=/hpcc-dev -DCPACK_THREADS=0 -DUSE_OPTIONAL=OFF -DSIGN_MODULES=${{ github.repository_owner == 'hpcc-systems' && 'ON' || 'OFF' }}" >> $GITHUB_OUTPUT
54+
echo "cmake_docker_config=-DCMAKE_BUILD_TYPE=RelWithDebInfo -DVCPKG_FILES_DIR=/hpcc-dev -DCPACK_THREADS=0 -DUSE_OPTIONAL=OFF -DSIGN_MODULES=${{ env.GITHUB_ACCOUNT == 'hpcc-systems' && 'ON' || 'OFF' }}" >> $GITHUB_OUTPUT
5055
echo 'gpg_import=gpg --batch --import /hpcc-dev/build/private.key' >> $GITHUB_OUTPUT
5156
5257
- name: Print vars
@@ -60,7 +65,8 @@ jobs:
6065
strategy:
6166
matrix:
6267
include:
63-
- os: ubuntu-22.04
68+
- os: ubuntu-24.04
69+
#- os: rockylinux-8
6470
#- os: centos-7
6571
# cmake_options_extra: "-DVCPKG_TARGET_TRIPLET=x64-centos-7-dynamic"
6672
fail-fast: false
@@ -87,7 +93,7 @@ jobs:
8793
- name: Checkout HPCC-Platform
8894
uses: actions/checkout@v3
8995
with:
90-
repository: ${{ github.repository_owner }}/HPCC-Platform
96+
repository: ${{ needs.preamble.outputs.github_account }}/HPCC-Platform
9197
ref: ${{ needs.preamble.outputs.community_ref }}
9298
submodules: recursive
9399
path: ${{ needs.preamble.outputs.folder_platform }}
@@ -124,8 +130,8 @@ jobs:
124130
builder: ${{ steps.buildx.outputs.name }}
125131
file: ${{ needs.preamble.outputs.folder_platform }}/dockerfiles/vcpkg/${{ matrix.os }}.dockerfile
126132
context: ${{ needs.preamble.outputs.folder_platform }}/dockerfiles/vcpkg
127-
push: ${{ github.repository_owner == 'hpcc-systems' }}
128-
load: ${{ github.repository_owner != 'hpcc-systems' }}
133+
push: ${{ needs.preamble.outputs.github_account == 'hpcc-systems' }}
134+
load: ${{ needs.preamble.outputs.github_account != 'hpcc-systems' }}
129135
build-args: |
130136
VCPKG_REF=${{ steps.vars.outputs.vcpkg_sha_short }}
131137
tags: |
@@ -142,19 +148,19 @@ jobs:
142148
mkdir -p ${{needs.preamble.outputs.folder_build }}
143149
ls -l
144150
echo "${{ secrets.SIGNING_SECRET }}" > ${{ needs.preamble.outputs.folder_build }}/private.key
145-
plugins=("CASSANDRAEMBED" "COUCHBASEEMBED" "ECLBLAS" "H3" "JAVAEMBED" "KAFKA" "MEMCACHED" "MONGODBEMBED" "MYSQLEMBED" "NLP" "PARQUETEMBED" "REDIS" "REMBED" "SQLITE3EMBED" "SQS" "WASMEMBED" "PLATFORM" "CLIENTTOOLS_ONLY")
151+
plugins=("CASSANDRAEMBED" "COUCHBASEEMBED" "ECLBLAS" "H3" "JAVAEMBED" "KAFKA" "MEMCACHED" "MONGODBEMBED" "MYSQLEMBED" "NLP" "PARQUETEMBED" "REDIS" "REMBED" "SQLITE3EMBED" "SQS" "WASMEMBED" "CLIENTTOOLS_ONLY")
146152
for plugin in "${plugins[@]}"; do
147153
sudo rm -f ${{ needs.preamble.outputs.folder_build }}/CMakeCache.txt
148154
sudo rm -rf ${{ needs.preamble.outputs.folder_build }}/CMakeFiles
149155
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 }} && \
150-
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 }} -D$plugin=ON -DCONTAINERIZED=OFF -DCPACK_STRIP_FILES=OFF ${{ matrix.cmake_options_extra }} && \
156+
cmake -S /hpcc-dev/HPCC-Platform -B /hpcc-dev/build -DVCPKG_FILES_DIR=/hpcc-dev ${{ needs.preamble.outputs.cmake_docker_config }} -DSIGN_MODULES_PASSPHRASE=${{ secrets.SIGN_MODULES_PASSPHRASE }} -DSIGN_MODULES_KEYID=${{ secrets.SIGN_MODULES_KEYID }} -D$plugin=ON -DCONTAINERIZED=OFF -DCPACK_STRIP_FILES=OFF ${{ matrix.cmake_options_extra }} && \
151157
cmake --build /hpcc-dev/build --parallel $(nproc) --target package"
152158
done
153159
154160
- name: Upload Artifacts CE Plugins
155161
uses: actions/upload-artifact@v4
156162
with:
157-
name: CE-HPCC-Plugins
163+
name: CE-HPCC-Plugins-${{ matrix.os }}
158164
path: |
159165
${{ needs.preamble.outputs.folder_build }}/*.deb
160166
${{ needs.preamble.outputs.folder_build }}/*.rpm

.github/workflows/build-docs.yml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ jobs:
2020
preamble:
2121
name: Publish Release
2222
env:
23-
# Tracking : 33264
24-
COMMUNITY_REF : "4feb5741059d812a12d3be7fcec938c24aa77492"
25-
#
23+
#COMMUNITY_REF: "dc1cdacdbdda6e5ca1c5b836e130c2deb2d2fe62"
24+
COMMUNITY_REF: <GIT REF>
25+
GITHUB_ACCOUNT: ${{ github.repository_owner }}
2626
runs-on: ubuntu-22.04
2727
permissions:
2828
contents: write
@@ -38,10 +38,13 @@ jobs:
3838
candidate_branch: ${{ steps.vars.outputs.candidate_branch }}
3939
cmake_docker_config: ${{ steps.vars.outputs.cmake_docker_config }}
4040
gpg_import: ${{ steps.vars.outputs.gpg_import }}
41+
github_account: ${{ steps.vars.outputs.github_account }}
4142
steps:
4243
- name: Calculate vars
4344
id: vars
4445
run: |
46+
github_account=${{ env.GITHUB_ACCOUNT }}
47+
echo "github_account=$github_account" >> $GITHUB_OUTPUT
4548
echo "folder_platform=${{ github.workspace }}/HPCC-Platform" >> $GITHUB_OUTPUT
4649
echo 'mount_platform=source="${{ github.workspace }}/HPCC-Platform",target=/hpcc-dev/HPCC-Platform,type=bind,consistency=cached' >> $GITHUB_OUTPUT
4750
echo "folder_build=${{ github.workspace }}/build" >> $GITHUB_OUTPUT
@@ -55,7 +58,7 @@ jobs:
5558
candidate_branch=$(echo $community_base_ref | cut -d'/' -f3)
5659
echo "candidate_branch=$candidate_branch" >> $GITHUB_OUTPUT
5760
echo "candidate_base_branch=$(echo $candidate_branch | awk -F'.' -v OFS='.' '{ $3="x"; print }')" >> $GITHUB_OUTPUT
58-
echo "cmake_docker_config=-DCMAKE_BUILD_TYPE=RelWithDebInfo -DVCPKG_FILES_DIR=/hpcc-dev -DCPACK_THREADS=0 -DUSE_OPTIONAL=OFF -DSIGN_MODULES=${{ github.repository_owner == 'hpcc-systems' && 'ON' || 'OFF' }}" >> $GITHUB_OUTPUT
61+
echo "cmake_docker_config=-DCMAKE_BUILD_TYPE=RelWithDebInfo -DVCPKG_FILES_DIR=/hpcc-dev -DCPACK_THREADS=0 -DUSE_OPTIONAL=OFF -DSIGN_MODULES=${{ env.GITHUB_ACCOUNT == 'hpcc-systems' && 'ON' || 'OFF' }}" >> $GITHUB_OUTPUT
5962
echo 'gpg_import=gpg --batch --import /hpcc-dev/build/private.key' >> $GITHUB_OUTPUT
6063
6164
- name: Print vars
@@ -96,7 +99,7 @@ jobs:
9699
- name: Checkout HPCC-Platform
97100
uses: actions/checkout@v3
98101
with:
99-
repository: g-pan/HPCC-Platform
102+
repository: ${{ needs.preamble.outputs.github_account }}/HPCC-Platform
100103
ref: ${{ needs.preamble.outputs.community_ref }}
101104
submodules: recursive
102105
path: ${{ needs.preamble.outputs.folder_platform }}
@@ -131,11 +134,10 @@ jobs:
131134
uses: docker/build-push-action@v4
132135
with:
133136
builder: ${{ steps.buildx.outputs.name }}
134-
#needed to update these lines post 9.12
135-
file: ${{ needs.preamble.outputs.folder_platform }}/dockerfiles/${{ matrix.os }}.dockerfile
136-
context: ${{ needs.preamble.outputs.folder_platform }}/dockerfiles
137-
push: ${{ github.repository_owner == 'hpcc-systems' }}
138-
load: ${{ github.repository_owner != 'hpcc-systems' }}
137+
file: ${{ needs.preamble.outputs.folder_platform }}/dockerfiles/vcpkg/${{ matrix.os }}.dockerfile
138+
context: ${{ needs.preamble.outputs.folder_platform }}/dockerfiles/vcpkg
139+
push: ${{ needs.preamble.outputs.github_account == 'hpcc-systems' }}
140+
load: ${{ needs.preamble.outputs.github_account != 'hpcc-systems' }}
139141
build-args: |
140142
VCPKG_REF=${{ steps.vars.outputs.vcpkg_sha_short }}
141143
tags: |
@@ -173,7 +175,7 @@ jobs:
173175
${{ needs.preamble.outputs.folder_build }}/Release/docs/*.zip
174176
${{ needs.preamble.outputs.folder_build }}/Release/docs/EN_US/*.zip
175177
${{ needs.preamble.outputs.folder_build }}/Release/docs/PT_BR/*.zip
176-
#RMD-ECLIPSE
178+
${{ needs.preamble.outputs.folder_build }}/docs/EN_US/EclipseHelp/*.zip
177179
${{ needs.preamble.outputs.folder_build }}/docs/EN_US/HTMLHelp/*.zip
178180
${{ needs.preamble.outputs.folder_build }}/docs/PT_BR/HTMLHelp/*.zip
179181
compression-level: 0

0 commit comments

Comments
 (0)