Skip to content

Commit 998f135

Browse files
committed
fix review
1 parent 61d758d commit 998f135

File tree

4 files changed

+9
-60
lines changed

4 files changed

+9
-60
lines changed

.github/workflows/rc.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,10 @@ jobs:
3131
archive:
3232
name: Archive
3333
runs-on: ubuntu-latest
34-
timeout-minutes: 5 # Can be reduced as we are not checking out submodules
34+
timeout-minutes: 5
3535
steps:
3636
- name: Checkout
3737
uses: actions/checkout@v4
38-
# No longer need 'with: { submodules: 'recursive' }'
3938

4039
- name: Prepare for tag
4140
if: github.ref_type == 'tag'
@@ -53,7 +52,6 @@ jobs:
5352
id="apache-iceberg-cpp-${VERSION}-rc${RC}"
5453
tar_gz="${id}.tar.gz"
5554
echo "TAR_GZ=${tar_gz}" >> ${GITHUB_ENV}
56-
# Reverted to the git archive command from the Go implementation
5755
git archive HEAD --prefix "${id}/" --output "${tar_gz}"
5856
sha512sum "${tar_gz}" > "${tar_gz}.sha512"
5957
@@ -78,7 +76,6 @@ jobs:
7876
os:
7977
- macos-latest
8078
- ubuntu-latest
81-
# Consider adding windows-latest if your project supports it
8279
# - windows-latest
8380
steps:
8481
- name: Install C++ Build Tools (Ubuntu)
@@ -112,9 +109,9 @@ jobs:
112109
fi
113110
echo "VERSION=${version}"
114111
echo "RC=${rc}"
115-
# You MUST create this verify_rc.sh script for C++
116-
# It should untar, cmake, build, and run tests (ctest)
117-
dev/release/verify_rc.sh "${version}" "${rc}"
112+
# The verify_rc.sh script will untar and
113+
# run cmake, build, tests (ctest) and install
114+
VERIFY_SIGN=0 VERIFY_DOWNLOAD=0 dev/release/verify_rc.sh "${version}" "${rc}"
118115
env:
119116
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
120117

@@ -128,7 +125,7 @@ jobs:
128125
contents: write
129126
steps:
130127
- name: Checkout
131-
uses: actions/checkout@v4
128+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
132129

133130
- uses: actions/download-artifact@v4
134131
with:

dev/release/README.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ $ dev/release/release_rc.sh ${VERSION} ${RC}
3737
You can use a draft shown by release_rc.sh for the email.)
3838
```
3939

40-
Here is an example to release RC1:
40+
Here is an example to release RC0 of version 0.1.0:
4141

4242
```console
43-
$ GH_TOKEN=${YOUR_GITHUB_TOKEN} dev/release/release_rc.sh 0.1.0 1
43+
$ GH_TOKEN=${YOUR_GITHUB_TOKEN} dev/release/release_rc.sh 0.1.0 0
4444
```
4545

46-
The arguments of `release_rc.sh` are the version and the RC number. If RC1 has a problem, we'll increment the RC number such as RC2, RC3 and so on.
46+
The arguments of `release_rc.sh` are the version and the RC number. If RC0 has a problem, we'll increment the RC number such as RC1, RC2 and so on.
4747

4848
Requirements to run `release_rc.sh`:
4949

@@ -71,9 +71,7 @@ $ svn ci KEYS
7171

7272
### Publish
7373

74-
We need to do the following to publish a new release:
75-
76-
* Publish to apache.org
74+
We need to publish to apache.org to publish a new release.
7775

7876
Run `dev/release/release.sh` to publish to apache.org:
7977

dev/release/rat_exclude_files.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ CHANGELOG.md
2323
build/**
2424
dist/**
2525
.git/**
26-
cmake_modules/**
27-
.cmake/**
2826
test/resources/**
2927
*.avro
3028
*.json

dev/release/verify_rc.sh

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -113,49 +113,6 @@ ensure_source_directory() {
113113
tar xf "${ARCHIVE_BASE_NAME}".tar.gz
114114
}
115115

116-
check_compiler() {
117-
echo "--- Verifying Build Environment ---"
118-
119-
# Check for minimum CMake version (e.g., 3.25)
120-
MIN_CMAKE_VERSION="3.25"
121-
CMAKE_VERSION=$(cmake --version | head -n1 | grep -oE '[0-9]+\.[0-9]+\.[0-9]+')
122-
echo "Found CMake version: $CMAKE_VERSION"
123-
if [ "$(printf '%s\n' "${MIN_CMAKE_VERSION}" "${CMAKE_VERSION}" | sort -V | head -n1)" != "${MIN_CMAKE_VERSION}" ]; then
124-
echo "ERROR: CMake ${MIN_CMAKE_VERSION} or higher is required, but found ${CMAKE_VERSION}."
125-
exit 1
126-
fi
127-
128-
# Check for C++23 compliant compiler
129-
local compiler_ok=0
130-
if command -v g++ >/dev/null 2>&1; then
131-
# Get major version: g++ (Debian 13.2.0-4) 13.2.0 -> 13
132-
GCC_MAJOR_VERSION=$(g++ -dumpversion | cut -d. -f1)
133-
echo "Found GCC version: $(g++ --version | head -n1)"
134-
# GCC 13 is the first version with full C++23 support
135-
if [ "${GCC_MAJOR_VERSION}" -ge 13 ]; then
136-
echo "GCC version is sufficient for C++23."
137-
compiler_ok=1
138-
fi
139-
fi
140-
141-
if [ "${compiler_ok}" -eq 0 ] && command -v clang++ >/dev/null 2>&1; then
142-
CLANG_MAJOR_VERSION=$(clang++ --version | head -n1 | grep -oE '[0-9]+' | head -n1)
143-
echo "Found Clang version: $(clang++ --version | head -n1)"
144-
# Clang 16 is the first version with full C++23 support
145-
if [ "${CLANG_MAJOR_VERSION}" -ge 16 ]; then
146-
echo "Clang version is sufficient for C++23."
147-
compiler_ok=1
148-
fi
149-
fi
150-
151-
if [ "${compiler_ok}" -eq 0 ]; then
152-
echo "ERROR: No C++23 compliant compiler found (GCC 13+ or Clang 16+ required)."
153-
exit 1
154-
fi
155-
156-
echo "--- Environment check passed ---"
157-
}
158-
159116
test_source_distribution() {
160117
echo "Building and testing Apache Iceberg C++..."
161118

@@ -185,7 +142,6 @@ cd "${VERIFY_TMPDIR}"
185142
import_gpg_keys
186143
fetch_archive
187144
ensure_source_directory
188-
check_compiler
189145
pushd "${ARCHIVE_BASE_NAME}"
190146
test_source_distribution
191147
popd

0 commit comments

Comments
 (0)