@@ -158,7 +158,7 @@ jobs:
158158 # echo "${env}" >> .env
159159 # done
160160 # fi
161- # archery docker run ${{ matrix.run-options || '' }} ubuntu-cpp-odbc
161+ # archery docker run ${{ matrix.run-options || '' }} ubuntu-cpp
162162 # - name: Docker Push
163163 # if: >-
164164 # success() &&
@@ -169,7 +169,7 @@ jobs:
169169 # ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_USER }}
170170 # ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
171171 # continue-on-error: true
172- # run: archery docker push ubuntu-cpp-odbc
172+ # run: archery docker push ubuntu-cpp
173173
174174 # msvc-arm64:
175175 # needs: check-labels
@@ -338,7 +338,8 @@ jobs:
338338
339339 odbc-linux :
340340 needs : check-labels
341- name : ODBC Linux
341+
342+ name : ODBC ${{ matrix.title }}
342343 runs-on : ubuntu-latest
343344 if : >-
344345 needs.check-labels.outputs.force == 'true' ||
@@ -347,6 +348,12 @@ jobs:
347348 timeout-minutes : 75
348349 strategy :
349350 fail-fast : false
351+ matrix :
352+ include :
353+ - image : ubuntu-cpp-odbc
354+ title : AMD64 Ubuntu C++23
355+ - image : debian-cpp-odbc
356+ title : AMD64 Debian C++23
350357 env :
351358 ARCH : amd64
352359 CLANG_TOOLS : 18
@@ -367,8 +374,8 @@ jobs:
367374 uses : actions/cache@v5
368375 with :
369376 path : .docker
370- key : ubuntu-cpp-odbc -${{ hashFiles('cpp/**') }}
371- restore-keys : ubuntu-cpp-odbc -
377+ key : ${{ matrix.image }} -${{ hashFiles('cpp/**') }}
378+ restore-keys : ${{ matrix.image }} -
372379 - name : Setup Python on hosted runner
373380 uses : actions/setup-python@v6
374381 with :
@@ -383,7 +390,7 @@ jobs:
383390 # GH-40558: reduce ASLR to avoid ASAN/LSAN crashes
384391 sudo sysctl -w vm.mmap_rnd_bits=28
385392 source ci/scripts/util_enable_core_dumps.sh
386- archery docker run ubuntu-cpp-odbc
393+ archery docker run ${{ matrix.image }}
387394 - name : Docker Push
388395 if : >-
389396 success() &&
@@ -394,7 +401,7 @@ jobs:
394401 ARCHERY_DOCKER_USER : ${{ secrets.DOCKERHUB_USER }}
395402 ARCHERY_DOCKER_PASSWORD : ${{ secrets.DOCKERHUB_TOKEN }}
396403 continue-on-error : true
397- run : archery docker push ubuntu-cpp
404+ run : archery docker push ${{ matrix.image }}
398405
399406 odbc-macos :
400407 needs : check-labels
0 commit comments