Skip to content

Commit 962db39

Browse files
committed
fix: address feedback from initial release
- suppress warnings from verify_rc.sh - fix release.sh not to rename artifacts - refactor wordings in the email templates
1 parent b717675 commit 962db39

File tree

4 files changed

+34
-54
lines changed

4 files changed

+34
-54
lines changed

cmake_modules/IcebergThirdpartyToolchain.cmake

Lines changed: 21 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,14 @@ macro(prepare_fetchcontent)
5151
set(CMAKE_COMPILE_WARNING_AS_ERROR FALSE)
5252
set(CMAKE_EXPORT_NO_PACKAGE_REGISTRY TRUE)
5353
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
54+
# Use "NEW" for CMP0077 by default.
55+
#
56+
# https://cmake.org/cmake/help/latest/policy/CMP0077.html
57+
#
58+
# option() honors normal variables.
59+
set(CMAKE_POLICY_DEFAULT_CMP0077
60+
NEW
61+
CACHE STRING "")
5462
endmacro()
5563

5664
# ----------------------------------------------------------------------
@@ -59,43 +67,20 @@ endmacro()
5967
function(resolve_arrow_dependency)
6068
prepare_fetchcontent()
6169

62-
set(ARROW_BUILD_SHARED
63-
OFF
64-
CACHE BOOL "" FORCE)
65-
set(ARROW_BUILD_STATIC
66-
ON
67-
CACHE BOOL "" FORCE)
70+
set(ARROW_BUILD_SHARED OFF)
71+
set(ARROW_BUILD_STATIC ON)
6872
# Work around undefined symbol: arrow::ipc::ReadSchema(arrow::io::InputStream*, arrow::ipc::DictionaryMemo*)
69-
set(ARROW_IPC
70-
ON
71-
CACHE BOOL "" FORCE)
72-
set(ARROW_FILESYSTEM
73-
ON
74-
CACHE BOOL "" FORCE)
75-
set(ARROW_JSON
76-
ON
77-
CACHE BOOL "" FORCE)
78-
set(ARROW_PARQUET
79-
ON
80-
CACHE BOOL "" FORCE)
81-
set(ARROW_SIMD_LEVEL
82-
"NONE"
83-
CACHE STRING "" FORCE)
84-
set(ARROW_RUNTIME_SIMD_LEVEL
85-
"NONE"
86-
CACHE STRING "" FORCE)
87-
set(ARROW_POSITION_INDEPENDENT_CODE
88-
ON
89-
CACHE BOOL "" FORCE)
90-
set(ARROW_DEPENDENCY_SOURCE
91-
"BUNDLED"
92-
CACHE STRING "" FORCE)
93-
set(ARROW_WITH_ZLIB
94-
ON
95-
CACHE BOOL "" FORCE)
96-
set(ZLIB_SOURCE
97-
"SYSTEM"
98-
CACHE STRING "" FORCE)
73+
set(ARROW_IPC ON)
74+
set(ARROW_FILESYSTEM ON)
75+
set(ARROW_JSON ON)
76+
set(ARROW_PARQUET ON)
77+
set(ARROW_SIMD_LEVEL "NONE")
78+
set(ARROW_RUNTIME_SIMD_LEVEL "NONE")
79+
set(ARROW_POSITION_INDEPENDENT_CODE ON)
80+
set(ARROW_DEPENDENCY_SOURCE "BUNDLED")
81+
set(ARROW_WITH_ZLIB ON)
82+
set(ZLIB_SOURCE "SYSTEM")
83+
set(ARROW_VERBOSE_THIRDPARTY_BUILD OFF)
9984

10085
fetchcontent_declare(VendoredArrow
10186
${FC_DECLARE_COMMON_OPTIONS}

dev/release/release.sh

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,6 @@ svn \
6363
svn co "${dist_url}/${release_id}"
6464
pushd "${release_id}"
6565

66-
echo "Renaming artifacts to their final release names..."
67-
for fname in ./*; do
68-
mv "${fname}" "${fname//-rc${rc}/}"
69-
done
70-
echo "Renamed files:"
71-
ls -l
72-
7366
gh release create "${tag}" \
7467
--repo "${repository}" \
7568
--title "Apache Iceberg C++ ${version}" \
@@ -111,15 +104,15 @@ To: [email protected]
111104
112105
Hello everyone,
113106
114-
I'm pleased to announce the release of Apache Iceberg C++ v${version}!
107+
I'm pleased to announce the release of Apache Iceberg C++ ${version}!
115108
116-
Apache Iceberg is an open table format for huge analytic datasets,
109+
Apache Iceberg is an open table format for huge analytic datasets.
117110
Iceberg delivers high query performance for tables with tens of
118111
petabytes of data, along with atomic commits, concurrent writes, and
119112
SQL-compatible table evolution.
120113
121-
This release contains <COMMIT_COUNT> commits from <CONTRIBUTOR_COUNT> unique contributors. Among
122-
the changes in this release are the following highlights:
114+
This release contains <COMMIT_COUNT> commits from <CONTRIBUTOR_COUNT> unique contributors.
115+
Among the changes in this release are the following highlights:
123116
124117
- <FEATURE_1>
125118
- <FEATURE_2>

dev/release/release_rc.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ fi
7272
rc_hash="$(git rev-list --max-count=1 "${rc_tag}")"
7373

7474
id="apache-iceberg-cpp-${version}"
75-
rc_id="${id}-${rc}"
75+
rc_id="${id}-rc${rc}"
7676
tar_gz="${id}.tar.gz"
7777

7878
if [ "${RELEASE_SIGN}" -gt 0 ]; then
@@ -126,26 +126,26 @@ echo ""
126126
echo "---------------------------------------------------------"
127127
cat <<MAIL
128128
129-
Subject: [VOTE][C++] Release Apache Iceberg C++ v${version} RC${rc}
129+
Subject: [VOTE][C++] Release Apache Iceberg C++ ${version} RC${rc}
130130
131131
Hi,
132132
133133
I would like to propose the following release candidate (RC${rc}) of
134-
Apache Iceberg C++ version v${version}.
134+
Apache Iceberg C++ ${version}.
135135
136136
This release candidate is based on commit:
137137
${rc_hash} [1]
138138
139-
The source release rc${rc} is hosted at [2].
139+
The source release RC${rc} is hosted at [2].
140140
141141
Please download, verify checksums and signatures, run the unit tests,
142142
and vote on the release. See [3] for how to validate a release candidate.
143143
144144
The vote will be open for at least 72 hours.
145145
146-
[ ] +1 Release this as Apache Iceberg C++ v${version}
146+
[ ] +1 Release this as Apache Iceberg C++ ${version}
147147
[ ] +0
148-
[ ] -1 Do not release this as Apache Iceberg C++ v${version} because...
148+
[ ] -1 Do not release this as Apache Iceberg C++ ${version} because...
149149
150150
[1]: https://github.com/apache/iceberg-cpp/tree/${rc_hash}
151151
[2]: https://dist.apache.org/repos/dist/dev/iceberg/apache-iceberg-cpp-${version}-rc${rc}

dev/release/verify_rc.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,11 @@ test_source_distribution() {
118118

119119
# Configure build
120120
cmake -S . -B build \
121+
-DCMAKE_CXX_FLAGS="-Wno-deprecated-declarations" \
121122
-DCMAKE_BUILD_TYPE=Release \
122123
-DICEBERG_BUILD_STATIC=ON \
123-
-DICEBERG_BUILD_SHARED=ON
124+
-DICEBERG_BUILD_SHARED=ON \
125+
--compile-no-warning-as-error
124126

125127
# Build
126128
cmake --build build --parallel $(nproc || sysctl -n hw.ncpu || echo 4)

0 commit comments

Comments
 (0)