Skip to content

Commit 71fe538

Browse files
author
鲁鹏帆
committed
fix(ci): use master Docker images for all PRs to support release branches
Docker images like `thirdparties-bin-test-ubuntu2204-v2.5` don't exist for release branches, causing CI startup failures. This change hardcodes all Docker image tags to use 'master' branch images, ensuring CI works for all branches including v2.5 and other release branches. Notes: - Added comment explaining the rationale at the top of the file - Updated image tags for: Tidy, IWYU, Build/Test Release, ASAN, jemalloc, Rockylinux9 - clang-tidy now compares against origin/master instead of origin/base_ref
1 parent 89f17c7 commit 71fe538

1 file changed

Lines changed: 18 additions & 10 deletions

File tree

.github/workflows/lint_and_test_cpp.yaml

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18+
# NOTE: Docker images use 'master' branch tag for all pull requests.
19+
# This ensures CI works for release branches (e.g., v2.5) that may not
20+
# have prebuilt Docker images.
21+
1822
name: Cpp CI
1923

2024
on:
@@ -64,7 +68,8 @@ jobs:
6468
USE_JEMALLOC: OFF
6569
ENABLE_ASAN: OFF
6670
container:
67-
image: apache/pegasus:thirdparties-bin-ubuntu2204-${{ github.base_ref }}
71+
# Use master image for all PRs to support release branches without prebuilt images
72+
image: apache/pegasus:thirdparties-bin-ubuntu2204-master
6873
steps:
6974
- name: Install Softwares
7075
run: |
@@ -79,7 +84,7 @@ jobs:
7984
run: |
8085
git config --global --add safe.directory $(pwd)
8186
./run.sh build --test --compiler clang-14,clang++-14 -t debug --skip_thirdparty -c --cmake_only
82-
./build_tools/clang_tidy.py --rev-range $(git log origin/${{ github.base_ref }} -n1 --format=format:"%H")
87+
./build_tools/clang_tidy.py --rev-range $(git log origin/master -n1 --format=format:"%H")
8388
shell: bash
8489

8590
iwyu:
@@ -91,7 +96,8 @@ jobs:
9196
USE_JEMALLOC: OFF
9297
ENABLE_ASAN: OFF
9398
container:
94-
image: apache/pegasus:thirdparties-bin-ubuntu2204-${{ github.base_ref }}
99+
# Use master image for all PRs to support release branches without prebuilt images
100+
image: apache/pegasus:thirdparties-bin-ubuntu2204-master
95101
steps:
96102
- uses: actions/checkout@v4
97103
- name: Free Disk Space (Ubuntu)
@@ -123,7 +129,8 @@ jobs:
123129
ARTIFACT_NAME: release
124130
BUILD_OPTIONS: -t release --test
125131
container:
126-
image: apache/pegasus:thirdparties-bin-test-ubuntu2204-${{ github.base_ref }}
132+
# Use master image for all PRs to support release branches without prebuilt images
133+
image: apache/pegasus:thirdparties-bin-test-ubuntu2204-master
127134
steps:
128135
- name: Clone code
129136
uses: actions/checkout@v4
@@ -193,7 +200,8 @@ jobs:
193200
env:
194201
ARTIFACT_NAME: release
195202
container:
196-
image: apache/pegasus:thirdparties-bin-test-ubuntu2204-${{ github.base_ref }}
203+
# Use master image for all PRs to support release branches without prebuilt images
204+
image: apache/pegasus:thirdparties-bin-test-ubuntu2204-master
197205
options: --cap-add=SYS_PTRACE
198206
steps:
199207
- uses: actions/checkout@v4
@@ -213,7 +221,7 @@ jobs:
213221
ARTIFACT_NAME: release_address
214222
BUILD_OPTIONS: --sanitizer address --disable_gperf --test
215223
container:
216-
image: apache/pegasus:thirdparties-bin-test-asan-ubuntu2204-${{ github.base_ref }}
224+
image: apache/pegasus:thirdparties-bin-test-asan-ubuntu2204-master
217225
steps:
218226
- uses: actions/checkout@v4
219227
- name: Rebuild thirdparty if needed
@@ -284,7 +292,7 @@ jobs:
284292
env:
285293
ARTIFACT_NAME: release_address
286294
container:
287-
image: apache/pegasus:thirdparties-bin-test-asan-ubuntu2204-${{ github.base_ref }}
295+
image: apache/pegasus:thirdparties-bin-test-asan-ubuntu2204-master
288296
options: --cap-add=SYS_PTRACE
289297
steps:
290298
- uses: actions/checkout@v4
@@ -394,7 +402,7 @@ jobs:
394402
ARTIFACT_NAME: release_jemalloc
395403
BUILD_OPTIONS: -t release --use_jemalloc --test
396404
container:
397-
image: apache/pegasus:thirdparties-bin-test-jemallc-ubuntu2204-${{ github.base_ref }}
405+
image: apache/pegasus:thirdparties-bin-test-jemallc-ubuntu2204-master
398406
steps:
399407
- uses: actions/checkout@v4
400408
- name: Rebuild thirdparty if needed
@@ -417,7 +425,7 @@ jobs:
417425
env:
418426
ARTIFACT_NAME: release_jemalloc
419427
container:
420-
image: apache/pegasus:thirdparties-bin-test-jemallc-ubuntu2204-${{ github.base_ref }}
428+
image: apache/pegasus:thirdparties-bin-test-jemallc-ubuntu2204-master
421429
options: --cap-add=SYS_PTRACE
422430
steps:
423431
- uses: actions/checkout@v4
@@ -472,7 +480,7 @@ jobs:
472480
BUILD_OPTIONS: -t debug --test --separate_servers
473481
PACK_OPTIONS: --separate_servers
474482
container:
475-
image: apache/pegasus:thirdparties-bin-rockylinux9-${{ github.base_ref }}
483+
image: apache/pegasus:thirdparties-bin-rockylinux9-master
476484
steps:
477485
- name: Clone code
478486
uses: actions/checkout@v3

0 commit comments

Comments
 (0)