From 3a6f059909ed5dab8587df5df4120315053d57a4 Mon Sep 17 00:00:00 2001 From: Eve <139727413+netrunnereve@users.noreply.github.com> Date: Sat, 14 Mar 2026 19:27:52 +0000 Subject: [PATCH] ci : try to optimize some jobs (#20521) * force arm version to test * run on either x86 or arm if we can help it, this only works for runs without ccache * readd other jobs * remove ccache --- .github/workflows/build-cmake-pkg.yml | 4 ++-- .github/workflows/build-linux-cross.yml | 4 ++-- .github/workflows/build.yml | 32 +++++-------------------- .github/workflows/release.yml | 2 +- .github/workflows/server-webui.yml | 2 +- 5 files changed, 12 insertions(+), 32 deletions(-) diff --git a/.github/workflows/build-cmake-pkg.yml b/.github/workflows/build-cmake-pkg.yml index 259efa43c8..84cf8ddf48 100644 --- a/.github/workflows/build-cmake-pkg.yml +++ b/.github/workflows/build-cmake-pkg.yml @@ -5,7 +5,7 @@ on: jobs: linux: - runs-on: ubuntu-24.04 + runs-on: ubuntu-slim steps: - uses: actions/checkout@v6 with: @@ -14,7 +14,7 @@ jobs: - name: Install dependencies run: | sudo apt update - sudo apt install -y build-essential tcl + sudo apt install -y build-essential tcl cmake - name: Build run: | diff --git a/.github/workflows/build-linux-cross.yml b/.github/workflows/build-linux-cross.yml index 8b6ebaf4a3..dbcc1ee2ae 100644 --- a/.github/workflows/build-linux-cross.yml +++ b/.github/workflows/build-linux-cross.yml @@ -142,7 +142,7 @@ jobs: # cmake --build build --config Release -j $(nproc) debian-13-loongarch64-cpu-cross: - runs-on: ubuntu-24.04 + runs-on: ${{ 'ubuntu-24.04-arm' || 'ubuntu-24.04' }} container: debian@sha256:653dfb9f86c3782e8369d5f7d29bb8faba1f4bff9025db46e807fa4c22903671 steps: @@ -197,7 +197,7 @@ jobs: cmake --build build --config Release -j $(nproc) debian-13-loongarch64-vulkan-cross: - runs-on: ubuntu-24.04 + runs-on: ${{ 'ubuntu-24.04-arm' || 'ubuntu-24.04' }} container: debian@sha256:653dfb9f86c3782e8369d5f7d29bb8faba1f4bff9025db46e807fa4c22903671 steps: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 102d904554..cfc78643b0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -317,8 +317,8 @@ jobs: cd build ctest -L main --verbose --timeout 900 - ubuntu-latest-llguidance: - runs-on: ubuntu-latest + ubuntu-24-llguidance: + runs-on: ${{ 'ubuntu-24.04-arm' || 'ubuntu-24.04' }} steps: - name: Clone @@ -345,8 +345,8 @@ jobs: cd build ctest -L main --verbose --timeout 900 - ubuntu-latest-cmake-rpc: - runs-on: ubuntu-latest + ubuntu-24-cmake-rpc: + runs-on: ${{ 'ubuntu-24.04-arm' || 'ubuntu-24.04' }} continue-on-error: true @@ -355,12 +355,6 @@ jobs: id: checkout uses: actions/checkout@v6 - # - name: ccache - # uses: ggml-org/ccache-action@v1.2.16 - # with: - # key: ubuntu-latest-cmake-rpc - # evict-old-files: 1d - - name: Dependencies id: depends run: | @@ -381,20 +375,13 @@ jobs: ctest -L main --verbose ubuntu-24-cmake-vulkan-deb: - runs-on: ubuntu-24.04 + runs-on: ${{ 'ubuntu-24.04-arm' || 'ubuntu-24.04' }} steps: - name: Clone id: checkout uses: actions/checkout@v6 - - name: ccache - uses: ggml-org/ccache-action@v1.2.16 - with: - key: ubuntu-24-cmake-vulkan-deb - evict-old-files: 1d - save: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} - - name: Dependencies id: depends run: | @@ -545,20 +532,13 @@ jobs: ctest -L main --verbose --timeout 900 ubuntu-24-wasm-webgpu: - runs-on: ubuntu-24.04 + runs-on: ${{ 'ubuntu-24.04-arm' || 'ubuntu-24.04' }} steps: - name: Clone id: checkout uses: actions/checkout@v6 - - name: ccache - uses: ggml-org/ccache-action@v1.2.16 - with: - key: ubuntu-latest-wasm-webgpu - evict-old-files: 1d - save: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} - - name: Install Emscripten run: | git clone https://github.com/emscripten-core/emsdk.git diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6d5d3774dd..1620d9a1bc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -952,7 +952,7 @@ jobs: permissions: contents: write # for creating release - runs-on: ubuntu-latest + runs-on: ubuntu-slim needs: - windows diff --git a/.github/workflows/server-webui.yml b/.github/workflows/server-webui.yml index 94899c9376..4d560ff58d 100644 --- a/.github/workflows/server-webui.yml +++ b/.github/workflows/server-webui.yml @@ -29,7 +29,7 @@ concurrency: jobs: webui-check: name: WebUI Checks - runs-on: ubuntu-latest + runs-on: ${{ 'ubuntu-24.04-arm' || 'ubuntu-24.04' }} continue-on-error: true steps: - name: Checkout code