Skip to content

Commit 2e32291

Browse files
authored
Merge branch 'master' into add_docker_base_slim
2 parents 9854911 + 3bf910c commit 2e32291

File tree

1,541 files changed

+140773
-12370
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,541 files changed

+140773
-12370
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,4 @@ fe/fe-core/src/main/java/org/apache/doris/fs @CalvinKirs
3939
fe/fe-core/src/main/java/org/apache/doris/fsv2 @CalvinKirs
4040
be/src/vec/functions @zclllyybb
4141
be/**/CMakeLists.txt @zclllyybb @BiteTheDDDDt
42+
be/src/olap/rowset/segment_v2/variant @eldenmoon @csun5285

.github/workflows/build-thirdparty.yml

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,17 @@ jobs:
6565
run: |
6666
git clone -b v7 https://github.com/easimon/maximize-build-space
6767
68-
- name: Maximize build space
69-
uses: ./maximize-build-space
70-
with:
71-
root-reserve-mb: 4096
72-
swap-size-mb: 8192
73-
remove-dotnet: 'true'
74-
remove-android: 'true'
75-
remove-haskell: 'true'
76-
remove-codeql: 'true'
77-
remove-docker-images: 'true'
68+
#- name: Maximize build space
69+
# uses: ./maximize-build-space
70+
# with:
71+
# root-reserve-mb: 4096
72+
# temp-reserve-mb: 4096
73+
# swap-size-mb: 8192
74+
# remove-dotnet: 'true'
75+
# remove-android: 'true'
76+
# remove-haskell: 'true'
77+
# remove-codeql: 'true'
78+
# remove-docker-images: 'true'
7879

7980
- name: Checkout ${{ github.ref }}
8081
uses: actions/checkout@v4
@@ -135,8 +136,18 @@ jobs:
135136
export CMAKE_POLICY_VERSION_MINIMUM=3.10
136137
export CUSTOM_CMAKE="/usr/local/bin/cmake"
137138
139+
#export TMPDIR=/home/runner/work/doris/doris/.tmp
140+
#export TMP=$TMPDIR
141+
#export TEMP=$TMPDIR
142+
#mkdir -p $TMPDIR
143+
144+
df -h
145+
echo $TMPDIR
146+
echo $RUNNER_TEMP
147+
138148
cd thirdparty
139-
./build-thirdparty.sh -j "$(nproc)"
149+
#./build-thirdparty.sh -j "$(nproc)"
150+
./build-thirdparty.sh -j 2
140151
141152
build_macos:
142153
name: Build Third Party Libraries (macOS)
@@ -195,7 +206,12 @@ jobs:
195206
export CMAKE_POLICY_VERSION_MINIMUM=3.10
196207
export CUSTOM_CMAKE="/usr/local/bin/cmake"
197208
209+
df -h
210+
echo $TMPDIR
211+
echo $RUNNER_TEMP
212+
198213
cd thirdparty
214+
#./build-thirdparty.sh -j "$(nproc)"
199215
./build-thirdparty.sh -j "$(nproc)"
200216
201217
build_macos_arm64:
@@ -255,6 +271,11 @@ jobs:
255271
export CMAKE_POLICY_VERSION_MINIMUM=3.10
256272
export CUSTOM_CMAKE="/usr/local/bin/cmake"
257273
274+
df -h
275+
echo $TMPDIR
276+
echo $RUNNER_TEMP
277+
258278
cd thirdparty
259-
./build-thirdparty.sh -j "$(nproc)"
279+
#./build-thirdparty.sh -j "$(nproc)"
280+
./build-thirdparty.sh -j 2
260281

.github/workflows/sonarcloud.yml

Lines changed: 0 additions & 158 deletions
This file was deleted.

.licenserc.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,14 @@ header:
4141
- "**/*.sql"
4242
- "**/*.lock"
4343
- "**/*.out"
44+
- "**/*.ldif"
4445
- "**/*.parquet"
4546
- "docs/.markdownlintignore"
4647
- "fe/fe-core/src/test/resources/data/net_snmp_normal"
4748
- "fe/fe-core/src/main/java/software/amazon/awssdk/core/client/builder/SdkDefaultClientBuilder.java"
4849
- "fe/fe-core/src/main/antlr4/org/apache/doris/nereids/JavaLexer.g4"
4950
- "fe/fe-core/src/main/antlr4/org/apache/doris/nereids/JavaParser.g4"
51+
- "fe/.idea/vcs.xml"
5052
- "be/dict/ik/*"
5153
- "be/dict/pinyin/*"
5254
- "be/src/common/signal_handler.h"
@@ -102,4 +104,5 @@ header:
102104
- "pytest/deploy/*.conf"
103105
- "tools/jeprof"
104106
- "tools/FlameGraph/*"
107+
- "fs_brokers/cdc_client/src/main/java/io/debezium/**"
105108
comment: on-failure

0 commit comments

Comments
 (0)