Skip to content

Commit 16600c8

Browse files
ihsandemirihsandemir
authored
Merge branch 'master' into allow-dependabot-to-run-PR-builder
2 parents 5cad501 + aa0c5e4 commit 16600c8

File tree

8 files changed

+92
-3299
lines changed

8 files changed

+92
-3299
lines changed

‎.github/workflows/build-pr.yml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -115,16 +115,6 @@ jobs:
115115
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
116116
HZ_TEST_AWS_INSTANCE_PRIVATE_IP: ${{ secrets.HZ_TEST_AWS_INSTANCE_PRIVATE_IP }}
117117

118-
# Tagged onto another build to avoid re-running the entire build to check separately
119-
- name: Check Reference Manual generated correctly
120-
run: |
121-
if ! git diff --quiet ${OUTPUT_REFERENCE_MANUAL_FILE}; then
122-
echo "::error file=${OUTPUT_REFERENCE_MANUAL_FILE}::File does not match generated version from template"
123-
exit 1
124-
fi
125-
env:
126-
OUTPUT_REFERENCE_MANUAL_FILE: Reference_Manual.md
127-
128118
shared-matrix:
129119
uses: ./.github/workflows/get-shared-matrix.yml
130120

‎.github/workflows/release.yml‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
name: Release
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
BRANCH_NAME:
7+
description: The branch to work with
8+
required: true
9+
10+
jobs:
11+
prepare:
12+
name: Prepare
13+
runs-on: ubuntu-latest
14+
outputs:
15+
tag_name: v${{ inputs.BRANCH_NAME }}
16+
steps:
17+
- run: exit 0
18+
19+
tag:
20+
name: Tag and delete branch
21+
runs-on: ubuntu-latest
22+
needs: prepare
23+
steps:
24+
- uses: actions/checkout@v5
25+
with:
26+
ref: ${{ inputs.BRANCH_NAME }}
27+
fetch-depth: 0
28+
29+
- name: Tag `${{ inputs.BRANCH_NAME }}` as `${{ needs.prepare.outputs.tag_name }}`
30+
run: |
31+
git tag ${{ needs.prepare.outputs.tag_name }} origin/${{ inputs.BRANCH_NAME }}
32+
git push origin ${{ needs.prepare.outputs.tag_name }}
33+
34+
- name: Delete `${{ inputs.BRANCH_NAME }}`
35+
run: |
36+
git push origin --delete ${{ inputs.BRANCH_NAME }}
37+
38+
pages:
39+
name: Publish docs
40+
runs-on: ubuntu-latest
41+
needs:
42+
- tag
43+
- prepare
44+
env:
45+
GH_PAGES_BRANCH: gh-pages
46+
steps:
47+
- uses: actions/checkout@v5
48+
with:
49+
path: repo
50+
ref: ${{ needs.prepare.outputs.tag_name }}
51+
52+
- uses: actions/checkout@v5
53+
with:
54+
ref: ${{ env.GH_PAGES_BRANCH}}
55+
path: ${{ env.GH_PAGES_BRANCH}}
56+
57+
- name: Install Doxygen
58+
run: |
59+
sudo apt-get update
60+
sudo apt-get install -y doxygen
61+
62+
- name: Generate Doxygen documentation
63+
working-directory: repo
64+
run: |
65+
doxygen
66+
67+
- name: Post-process docs
68+
run: |
69+
mv repo/docs/html ${GH_PAGES_BRANCH}/${{ inputs.BRANCH_NAME }}
70+
71+
# doc-index.html
72+
sed -i \
73+
"/Development Branch/a\<li><a href=\"https://github.com/${GITHUB_REPOSITORY}/blob/${{ needs.prepare.outputs.tag_name }}/Reference_Manual.md\">${{ inputs.BRANCH_NAME }}</a></li>" \
74+
"${GH_PAGES_BRANCH}/doc-index.html"
75+
76+
# api-index.html
77+
sed -i \
78+
"/<ul>/a\ <li><a href=\"${{ inputs.BRANCH_NAME }}/index.html\">${{ inputs.BRANCH_NAME }}</a></li>" \
79+
"${GH_PAGES_BRANCH}/api-index.html"
80+
81+
- name: Create Pull Request
82+
uses: peter-evans/create-pull-request@v7
83+
with:
84+
branch: ${{ needs.prepare.outputs.tag_name }}_doc_update_run_${{ github.run_id }}
85+
title: Add the new C++ client release (`${{ needs.prepare.outputs.tag_name }}`) documentation
86+
body: ""
87+
path: ${{ env.GH_PAGES_BRANCH}}

‎CMakeLists.txt‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,12 @@
1717
cmake_minimum_required(VERSION 3.10)
1818

1919
project(hazelcast-cpp-client
20-
VERSION 5.5.0
20+
VERSION 5.6.0
2121
DESCRIPTION "Hazelcast C++ Client"
2222
LANGUAGES CXX)
2323

2424
set(CMAKE_CXX_STANDARD_REQUIRED ON)
2525

26-
# Generate the Reference_Manual.md file using the latest project version.
27-
# If the project version changes, the generated Reference_Manual.md file needs to be
28-
# committed to the repository after generation.
29-
configure_file(Reference_Manual.md.in "${CMAKE_SOURCE_DIR}/Reference_Manual.md" @ONLY)
30-
31-
# Add a custom target to execute the copy command
32-
add_custom_target(copy_reference_manual ALL
33-
DEPENDS "${CMAKE_SOURCE_DIR}/Reference_Manual.md"
34-
)
3526
# Set the default build type for single-config generators if not given
3627
get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
3728
if ((NOT is_multi_config) AND (NOT CMAKE_BUILD_TYPE))

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<p align="center">
22
<a href="https://hazelcast.com">
3-
<img class="center" src="https://docs.hazelcast.com/_/img/hazelcast-logo.svg" alt="logo">
3+
<img class="center" src="https://hazelcast.com/files/brand-images/logo/hazelcast-logo.svg" alt="Hazelcast logo">
44
</a>
55
<h2 align="center">Hazelcast C++ Client</h2>
66
</p>
@@ -15,7 +15,7 @@
1515
<img src="https://img.shields.io/twitter/follow/Hazelcast.svg?style=flat-square&colorA=1da1f2&colorB=&label=Follow%20on%20Twitter" alt="Follow on Twitter">
1616
</a>
1717
<a href="LICENSE">
18-
<img src="https://img.shields.io/badge/License-Apache_2.0-blue.svg" alt="Chat on Slack">
18+
<img src="https://img.shields.io/badge/License-Apache_2.0-blue.svg" alt="Apache 2.0 license badge">
1919
</a>
2020
</p>
2121

‎Reference_Manual.md‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
<!-- THIS FILE IS AUTO GENERATED FILE.
2-
MODIFY Reference_Manual.md.in TO MAKE CHANGES.
3-
If you make any changes in Reference_Manual.md.in file,
4-
you need to build the project which will re-generate the Reference_Manual.md file
5-
and commit this generated reference manual in the github repository.
6-
-->
7-
81
# Hazelcast C++ Client Library
92
<!--ts-->
103
* [Hazelcast C++ Client Library](#hazelcast-c-client-library)

0 commit comments

Comments
 (0)