This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/doris-thirdparty.git
The following commit(s) were added to refs/heads/main by this push:
new a5fe696f1a7 Fix macOS thirdparty builds and Docker release gating
(#405)
a5fe696f1a7 is described below
commit a5fe696f1a7cec3b9e66b7ed1abff53c9ece75e4
Author: Dongyang Li <[email protected]>
AuthorDate: Thu Aug 6 17:43:54 2026 +0800
Fix macOS thirdparty builds and Docker release gating (#405)
* Fix macOS build and Docker release gating
* Add fallback for rate-limited GCC header download
---
.github/workflows/build.yml | 61 ++++++++++++++++++++++++++++++++++++++-------
1 file changed, 52 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 75d8c10544c..1606cf5142d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -214,6 +214,7 @@ jobs:
env:
GH_REPO: ${{ github.repository }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ CMAKE_VERSION: 3.25.3
steps:
- name: Checkout easimon/maximize-build-space
if: ${{ matrix.config.name == 'Linux' }}
@@ -244,6 +245,24 @@ jobs:
-o doris-thirdparty-source.tgz
tar -zxvf doris-thirdparty-source.tgz
+ # The gcc.gnu.org git endpoint occasionally rate-limits hosted
runners and
+ # leaves this header empty in the cached source archive. Repair only
an
+ # invalid copy, and verify the mirror content before replacing it.
+ tsan_header="src/tsan_interface_atomic.h"
+ expected_md5="d72679bea167d6a513d959f5abd149dc"
+ actual_md5="$(openssl dgst -md5 "${tsan_header}" | awk '{ print $NF
}')"
+ if [[ "${actual_md5}" != "${expected_md5}" ]]; then
+ tsan_header_tmp="${tsan_header}.tmp"
+ trap 'rm -f "${tsan_header_tmp}"' EXIT
+ curl --fail --location --retry 3 \
+
https://raw.githubusercontent.com/gcc-mirror/gcc/releases/gcc-7/libsanitizer/include/sanitizer/tsan_interface_atomic.h
\
+ --output "${tsan_header_tmp}"
+ actual_md5="$(openssl dgst -md5 "${tsan_header_tmp}" | awk '{
print $NF }')"
+ [[ "${actual_md5}" == "${expected_md5}" ]]
+ mv "${tsan_header_tmp}" "${tsan_header}"
+ trap - EXIT
+ fi
+
- name: Prepare for ${{ matrix.config.os }}
run: |
# Doris's lance-c build prefers Rust 1.91.0 when it is installed.
@@ -254,11 +273,11 @@ jobs:
if [[ "${{ matrix.config.name }}" =~ macOS-* ]]; then
# Install packages except cmake
brew install ${{ matrix.config.packages }} || true
- # Install specific version of cmake
+ # Arrow 24 requires CMake 3.25 or newer.
brew unlink cmake || true
- wget
https://github.com/Kitware/CMake/releases/download/v3.22.1/cmake-3.22.1-macos-universal.tar.gz
- tar -xzf cmake-3.22.1-macos-universal.tar.gz
- sudo cp -r cmake-3.22.1-macos-universal/CMake.app/Contents/*
/usr/local/
+ wget
"https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-macos-universal.tar.gz";
+ tar -xzf "cmake-${CMAKE_VERSION}-macos-universal.tar.gz"
+ sudo cp -r
"cmake-${CMAKE_VERSION}-macos-universal/CMake.app/Contents/"* /usr/local/
cmake --version
else
export DEFAULT_DIR='/opt/doris'
@@ -315,16 +334,35 @@ jobs:
update-docker:
name: Update Docker Image
needs: [prerelease, build]
+ # macOS failures must not block Docker when the current Linux x86_64
package is available.
if: |
- always() && (
- (needs.prerelease.outputs.should_release == 'true' &&
needs.build.result == 'success') ||
- (github.event_name == 'workflow_dispatch' && needs.build.result !=
'failure')
- )
+ always() &&
+ needs.build.result != 'cancelled' &&
+ (needs.prerelease.outputs.should_release == 'true' || github.event_name
== 'workflow_dispatch')
runs-on: ubuntu-latest
env:
GH_REPO: ${{ github.repository }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
+ - name: Verify Linux x86_64 prebuilt provenance
+ run: |
+ expected_commit="${{ needs.prerelease.outputs.thirdparty_commit_hash
}}"
+ if [[ -z "${expected_commit}" ]]; then
+ echo 'Expected thirdparty commit hash is empty' >&2
+ exit 1
+ fi
+
+ archive='doris-thirdparty-prebuilt-linux-x86_64.tar.xz'
+ gh release download automation --pattern "${archive}"
+ actual_commit="$(tar -xOf "${archive}"
installed/_doris_thirdparty_commit_)"
+ if [[ "${actual_commit}" != "${expected_commit}" ]]; then
+ echo "Linux prebuilt provenance mismatch: expected
${expected_commit}, got ${actual_commit}" >&2
+ exit 1
+ fi
+
+ echo "Verified Linux prebuilt thirdparty commit: ${actual_commit}"
+ rm -f "${archive}"
+
- name: Checkout docker/setup-buildx-action
run: |
rm -rf ./.github/actions/setup-buildx-action
@@ -477,5 +515,10 @@ jobs:
run: |
gh release download automation
- echo -ne "Status: *FAILURE*\n\n## SHA256
Checksums\n\`\`\`\n$(sha256sum *)\n\`\`\`" >release_note.md
+ content="$(gh release view automation | sed -n '/Update
Time:/,/Doris Version:/p')"
+ if [[ -z "${content}" ]]; then
+ echo 'Unable to preserve release provenance in the failure note'
>&2
+ exit 1
+ fi
+ echo -ne "${content}\nStatus: *FAILURE*\n\n## SHA256
Checksums\n\`\`\`\n$(sha256sum *)\n\`\`\`" >release_note.md
gh release edit --latest -F release_note.md automation
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
