From c44439685644b313b20937fdde735cecb34cfd26 Mon Sep 17 00:00:00 2001 From: Zehua Zou Date: Mon, 22 Jun 2026 17:01:05 +0800 Subject: [PATCH 1/3] chore: upgrade ubuntu images --- .github/workflows/asf-allowlist-check.yml | 2 +- .github/workflows/aws_test.yml | 12 ++++++------ .github/workflows/cpp-linter.yml | 2 +- .github/workflows/rc.yml | 8 ++++---- .github/workflows/sanitizer_test.yml | 2 +- .github/workflows/sql_catalog_test.yml | 4 ++-- .github/workflows/test.yml | 8 ++++---- .github/workflows/zizmor.yml | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/asf-allowlist-check.yml b/.github/workflows/asf-allowlist-check.yml index 202852115..ea207b281 100644 --- a/.github/workflows/asf-allowlist-check.yml +++ b/.github/workflows/asf-allowlist-check.yml @@ -36,7 +36,7 @@ permissions: jobs: asf-allowlist-check: if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }} - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 steps: - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: diff --git a/.github/workflows/aws_test.yml b/.github/workflows/aws_test.yml index 388d7508e..fb7f7b569 100644 --- a/.github/workflows/aws_test.yml +++ b/.github/workflows/aws_test.yml @@ -47,15 +47,15 @@ jobs: fail-fast: false matrix: include: - - title: Ubuntu 24.04, S3 + SigV4, bundled AWS SDK - runs-on: ubuntu-24.04 + - title: Ubuntu 26.04, S3 + SigV4, bundled AWS SDK + runs-on: ubuntu-26.04 CC: gcc-14 CXX: g++-14 s3: "ON" sigv4: "ON" bundle_awssdk: "ON" - - title: Ubuntu 24.04, S3 + SigV4, system AWS SDK - runs-on: ubuntu-24.04 + - title: Ubuntu 26.04, S3 + SigV4, system AWS SDK + runs-on: ubuntu-26.04 CC: gcc-14 CXX: g++-14 s3: "ON" @@ -143,8 +143,8 @@ jobs: # its CMake config, not pkg-config whose Cflags force -std=c++11). meson-sigv4: if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }} - name: Meson SigV4 (AMD64 Ubuntu 24.04) - runs-on: ubuntu-24.04 + name: Meson SigV4 (AMD64 Ubuntu 26.04) + runs-on: ubuntu-26.04 timeout-minutes: 45 env: SCCACHE_DIR: ${{ github.workspace }}/.sccache diff --git a/.github/workflows/cpp-linter.yml b/.github/workflows/cpp-linter.yml index 377e806ad..2e3e022d6 100644 --- a/.github/workflows/cpp-linter.yml +++ b/.github/workflows/cpp-linter.yml @@ -34,7 +34,7 @@ concurrency: jobs: cpp-linter: if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }} - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 permissions: contents: read pull-requests: write diff --git a/.github/workflows/rc.yml b/.github/workflows/rc.yml index 7241981c5..6fcdb3342 100644 --- a/.github/workflows/rc.yml +++ b/.github/workflows/rc.yml @@ -31,7 +31,7 @@ permissions: jobs: archive: name: Archive - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 timeout-minutes: 5 steps: - name: Checkout @@ -79,10 +79,10 @@ jobs: matrix: os: - macos-26 - - ubuntu-24.04 + - ubuntu-26.04 # - windows-latest include: - - os: ubuntu-24.04 + - os: ubuntu-26.04 CC: gcc-14 CXX: g++-14 steps: @@ -130,7 +130,7 @@ jobs: if: github.ref_type == 'tag' needs: - verify - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 permissions: contents: write steps: diff --git a/.github/workflows/sanitizer_test.yml b/.github/workflows/sanitizer_test.yml index e461bd1ed..0910b9215 100644 --- a/.github/workflows/sanitizer_test.yml +++ b/.github/workflows/sanitizer_test.yml @@ -38,7 +38,7 @@ jobs: sanitizer-test: if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }} name: "ASAN and UBSAN Tests" - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 env: SCCACHE_DIR: ${{ github.workspace }}/.sccache SCCACHE_CACHE_SIZE: "2G" diff --git a/.github/workflows/sql_catalog_test.yml b/.github/workflows/sql_catalog_test.yml index d089ae4c6..768299889 100644 --- a/.github/workflows/sql_catalog_test.yml +++ b/.github/workflows/sql_catalog_test.yml @@ -47,8 +47,8 @@ jobs: fail-fast: false matrix: include: - - title: AMD64 Ubuntu 24.04 - runs-on: ubuntu-24.04 + - title: AMD64 Ubuntu 26.04 + runs-on: ubuntu-26.04 CC: gcc-14 CXX: g++-14 cmake_build_type: Debug diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a51a29866..e63101194 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,8 +40,8 @@ env: jobs: ubuntu: if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }} - name: AMD64 Ubuntu 24.04 - runs-on: ubuntu-24.04 + name: AMD64 Ubuntu 26.04 + runs-on: ubuntu-26.04 timeout-minutes: 30 strategy: fail-fast: false @@ -195,8 +195,8 @@ jobs: fail-fast: false matrix: include: - - title: AMD64 Ubuntu 24.04 - runs-on: ubuntu-24.04 + - title: AMD64 Ubuntu 26.04 + runs-on: ubuntu-26.04 CC: gcc-14 CXX: g++-14 meson-setup-args: -Drest_integration_test=enabled diff --git a/.github/workflows/zizmor.yml b/.github/workflows/zizmor.yml index f6665ffae..388431627 100644 --- a/.github/workflows/zizmor.yml +++ b/.github/workflows/zizmor.yml @@ -36,7 +36,7 @@ jobs: zizmor: if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }} name: Run zizmor 🌈 - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 permissions: {} steps: - name: Checkout repository From c75dbb63b42c8bb9bba69075acf57c5f8a0b64e1 Mon Sep 17 00:00:00 2001 From: Zehua Zou Date: Tue, 23 Jun 2026 15:53:41 +0800 Subject: [PATCH 2/3] address review --- .github/workflows/asf-allowlist-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/asf-allowlist-check.yml b/.github/workflows/asf-allowlist-check.yml index ea207b281..0c10af655 100644 --- a/.github/workflows/asf-allowlist-check.yml +++ b/.github/workflows/asf-allowlist-check.yml @@ -36,7 +36,7 @@ permissions: jobs: asf-allowlist-check: if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }} - runs-on: ubuntu-26.04 + runs-on: ubuntu-slim steps: - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: From 039cf9fdcdb00853a2251a2cf370e7f5e9a92ac4 Mon Sep 17 00:00:00 2001 From: Zehua Zou Date: Tue, 23 Jun 2026 16:59:48 +0800 Subject: [PATCH 3/3] fix ci aws bundle compile --- .github/workflows/aws_test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/aws_test.yml b/.github/workflows/aws_test.yml index fb7f7b569..47c54241d 100644 --- a/.github/workflows/aws_test.yml +++ b/.github/workflows/aws_test.yml @@ -84,7 +84,7 @@ jobs: - name: Install dependencies on Ubuntu if: ${{ startsWith(matrix.runs-on, 'ubuntu') }} shell: bash - run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev + run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev libjitterentropy3-dev - name: Cache vcpkg packages if: ${{ startsWith(matrix.runs-on, 'ubuntu') && matrix.bundle_awssdk == 'OFF' }} uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5 @@ -160,7 +160,7 @@ jobs: - name: Install build dependencies shell: bash run: | - sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev + sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev libjitterentropy3-dev python3 -m pip install --upgrade pip python3 -m pip install -r requirements.txt - name: Cache vcpkg packages