Skip to content

Commit 85912cb

Browse files
yokoflyyokofly
authored
revert #921 CI stick to clang-16 as a workaround (#926)
1 parent 371cb59 commit 85912cb

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

‎.github/workflows/manual_trigger_build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
rm cache${SANITIZER:+_}$SANITIZER${ARCH:+_}$ARCH.tar.gz
5656
5757
# compiling
58-
./docker/packager/packager --package-type binary --docker-image-version clang-19 --sanitizer $SANITIZER --proton-build --enable-proton-local --cache ccache --ccache_dir $GITHUB_WORKSPACE/ccache --output-dir $GITHUB_WORKSPACE/output
58+
./docker/packager/packager --package-type binary --docker-image-version clang-16 --sanitizer $SANITIZER --proton-build --enable-proton-local --cache ccache --ccache_dir $GITHUB_WORKSPACE/ccache --output-dir $GITHUB_WORKSPACE/output
5959
6060
# clear compiling footprint
6161
rm -rf $GITHUB_WORKSPACE/ccache
@@ -103,7 +103,7 @@ jobs:
103103
rm cache${ARCH:+_}$ARCH.tar.gz
104104
105105
# compiling
106-
./docker/packager/packager --package-type binary --docker-image-version clang-19 --build-type release --proton-build --enable-proton-local --cache ccache --ccache_dir $GITHUB_WORKSPACE/ccache --output-dir $GITHUB_WORKSPACE/output
106+
./docker/packager/packager --package-type binary --docker-image-version clang-16 --build-type release --proton-build --enable-proton-local --cache ccache --ccache_dir $GITHUB_WORKSPACE/ccache --output-dir $GITHUB_WORKSPACE/output
107107
# release doesn't build unit_tests_dbms
108108
# clear compiling footprint
109109
rm -rf $GITHUB_WORKSPACE/ccache

‎.github/workflows/nightly_test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
mkdir $GITHUB_WORKSPACE/ccache
3131
echo "max_size = 100.0G" > $GITHUB_WORKSPACE/ccache/ccache.conf
3232
33-
./docker/packager/packager --package-type binary --docker-image-version clang-19 ${SANITIZER:+--sanitizer} $SANITIZER --proton-build --enable-proton-local --cache ccache --ccache_dir $GITHUB_WORKSPACE/ccache --output-dir $GITHUB_WORKSPACE/output
33+
./docker/packager/packager --package-type binary --docker-image-version clang-16 ${SANITIZER:+--sanitizer} $SANITIZER --proton-build --enable-proton-local --cache ccache --ccache_dir $GITHUB_WORKSPACE/ccache --output-dir $GITHUB_WORKSPACE/output
3434
3535
if [ ! -f "$GITHUB_WORKSPACE/output/proton" ]; then
3636
echo "Compiling proton Failed"
@@ -179,7 +179,7 @@ jobs:
179179
mkdir $GITHUB_WORKSPACE/ccache
180180
echo "max_size = 100.0G" > $GITHUB_WORKSPACE/ccache/ccache.conf
181181
182-
./docker/packager/packager --package-type binary --docker-image-version clang-19 --build-type release --proton-build --enable-proton-local --cache ccache --ccache_dir $GITHUB_WORKSPACE/ccache --output-dir $GITHUB_WORKSPACE/output
182+
./docker/packager/packager --package-type binary --docker-image-version clang-16 --build-type release --proton-build --enable-proton-local --cache ccache --ccache_dir $GITHUB_WORKSPACE/ccache --output-dir $GITHUB_WORKSPACE/output
183183
184184
if [ ! -f "$GITHUB_WORKSPACE/output/proton" ]; then
185185
echo "Compiling proton Failed"
@@ -300,7 +300,7 @@ jobs:
300300
mkdir $GITHUB_WORKSPACE/ccache
301301
echo "max_size = 100.0G" > $GITHUB_WORKSPACE/ccache/ccache.conf
302302
303-
./docker/packager/packager --package-type binary --docker-image-version clang-19 ${SANITIZER:+--sanitizer} $SANITIZER --proton-build --enable-proton-local --cache ccache --ccache_dir $GITHUB_WORKSPACE/ccache --output-dir $GITHUB_WORKSPACE/output
303+
./docker/packager/packager --package-type binary --docker-image-version clang-16 ${SANITIZER:+--sanitizer} $SANITIZER --proton-build --enable-proton-local --cache ccache --ccache_dir $GITHUB_WORKSPACE/ccache --output-dir $GITHUB_WORKSPACE/output
304304
305305
if [ ! -f "$GITHUB_WORKSPACE/output/proton" ]; then
306306
echo "Compiling proton Failed"

‎.github/workflows/proton_ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
rm cache${SANITIZER:+_}$SANITIZER${ARCH:+_}$ARCH.tar.gz
6767
6868
# compiling
69-
./docker/packager/packager --package-type binary --docker-image-version clang-19 --sanitizer $SANITIZER --proton-build --enable-proton-local --cache ccache --ccache_dir $GITHUB_WORKSPACE/ccache --output-dir $GITHUB_WORKSPACE/output
69+
./docker/packager/packager --package-type binary --docker-image-version clang-16 --sanitizer $SANITIZER --proton-build --enable-proton-local --cache ccache --ccache_dir $GITHUB_WORKSPACE/ccache --output-dir $GITHUB_WORKSPACE/output
7070
7171
tar -zcf ./cache${SANITIZER:+_}$SANITIZER${ARCH:+_}$ARCH.tar.gz -C $GITHUB_WORKSPACE/ccache .
7272
aws s3 cp --no-progress ./cache${SANITIZER:+_}$SANITIZER${ARCH:+_}$ARCH.tar.gz s3://tp-internal/proton/ci_cache/

‎.github/workflows/release_build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
rm cache.tar.gz
3131
3232
# compiling
33-
./docker/packager/packager --package-type binary --docker-image-version clang-19 --build-type release --proton-build --enable-proton-local --cache ccache --ccache_dir $GITHUB_WORKSPACE/ccache --output-dir $GITHUB_WORKSPACE/output
33+
./docker/packager/packager --package-type binary --docker-image-version clang-16 --build-type release --proton-build --enable-proton-local --cache ccache --ccache_dir $GITHUB_WORKSPACE/ccache --output-dir $GITHUB_WORKSPACE/output
3434
3535
if [ ! -f "$GITHUB_WORKSPACE/output/proton" ]; then
3636
echo "Compiling proton Failed"
@@ -97,7 +97,7 @@ jobs:
9797
rm cache-arm.tar.gz
9898
9999
# compiling
100-
./docker/packager/packager --package-type binary --docker-image-version clang-19 --build-type release --proton-build --enable-proton-local --cache ccache --ccache_dir $GITHUB_WORKSPACE/ccache --output-dir $GITHUB_WORKSPACE/output
100+
./docker/packager/packager --package-type binary --docker-image-version clang-16 --build-type release --proton-build --enable-proton-local --cache ccache --ccache_dir $GITHUB_WORKSPACE/ccache --output-dir $GITHUB_WORKSPACE/output
101101
102102
# get proton tag
103103
PROTON_TAG=`grep "SET(VERSION_DESCRIBE" $GITHUB_WORKSPACE/cmake/autogenerated_versions.txt | sed 's/^.*VERSION_DESCRIBE \(.*\)$/\1/' | sed 's/[) ].*//'`
@@ -218,7 +218,7 @@ jobs:
218218
echo "max_size = 100.0G" > $GITHUB_WORKSPACE/ccache/ccache.conf
219219
220220
# compiling
221-
./docker/packager/packager --package-type binary --docker-image-version clang-19 --build-type release --proton-build --enable-proton-local --cache ccache --ccache_dir $GITHUB_WORKSPACE/ccache --output-dir $GITHUB_WORKSPACE/output --compiler clang-19-darwin
221+
./docker/packager/packager --package-type binary --docker-image-version clang-16 --build-type release --proton-build --enable-proton-local --cache ccache --ccache_dir $GITHUB_WORKSPACE/ccache --output-dir $GITHUB_WORKSPACE/output --compiler clang-16-darwin
222222
223223
if [ ! -f "$GITHUB_WORKSPACE/output/proton" ]; then
224224
echo "Compiling proton Failed"
@@ -276,7 +276,7 @@ jobs:
276276
mkdir $GITHUB_WORKSPACE/ccache
277277
echo "max_size = 100.0G" > $GITHUB_WORKSPACE/ccache/ccache.conf
278278
# compiling
279-
./docker/packager/packager --package-type binary --docker-image-version clang-19 --build-type release --proton-build --enable-proton-local --cache ccache --ccache_dir $GITHUB_WORKSPACE/ccache --output-dir $GITHUB_WORKSPACE/output --compiler clang-19-darwin-aarch64
279+
./docker/packager/packager --package-type binary --docker-image-version clang-16 --build-type release --proton-build --enable-proton-local --cache ccache --ccache_dir $GITHUB_WORKSPACE/ccache --output-dir $GITHUB_WORKSPACE/output --compiler clang-16-darwin-aarch64
280280
if [ ! -f "$GITHUB_WORKSPACE/output/proton" ]; then
281281
echo "Compiling proton Failed"
282282
exit 127

‎docker/packager/binary/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# rebuild in https://github.com/timeplus-io/proton/pull/921
1+
# rebuild in https://github.com/timeplus-io/proton/pull/921 revert in #925
22
# docker build -t timeplus/proton-binary-builder .
33
FROM ubuntu:20.04
44

‎docker/packager/packager

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ SCRIPT_PATH = os.path.realpath(__file__)
1111
# proton: starts.
1212
IMAGE_MAP = {
1313
"deb": "ghcr.io/timeplus-io/proton-deb-builder", # Not used
14-
"binary": "timeplus/proton-binary-builder",
14+
"binary": "ghcr.io/timeplus-io/proton-binary-builder",
1515
}
1616
# proton: ends.
1717

@@ -281,14 +281,14 @@ if __name__ == "__main__":
281281
parser.add_argument("--output-dir", required=True)
282282

283283
parser.add_argument("--compiler", choices=(
284-
"clang-19",
285-
"clang-19-darwin",
286-
"clang-19-darwin-aarch64",
287-
"clang-19-aarch64",
288-
"clang-19-ppc64le",
289-
"clang-19-freebsd",
284+
"clang-16",
285+
"clang-16-darwin",
286+
"clang-16-darwin-aarch64",
287+
"clang-16-aarch64",
288+
"clang-16-ppc64le",
289+
"clang-16-freebsd",
290290
),
291-
default="clang-19")
291+
default="clang-16")
292292

293293
parser.add_argument("--sanitizer", choices=("address", "thread", "memory", "undefined", ""), default="")
294294
parser.add_argument("--clang-tidy", action="store_true")

0 commit comments

Comments
 (0)