From 50731dd017efd5b444259f172757f223f2abd06a Mon Sep 17 00:00:00 2001 From: Schuyler Eldridge Date: Thu, 24 Apr 2025 20:50:15 -0400 Subject: [PATCH 1/2] [ci] Bump CI images Bump the CI images to use Ubuntu 24.04. Signed-off-by: Schuyler Eldridge --- .github/workflows/buildAndTest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/buildAndTest.yml b/.github/workflows/buildAndTest.yml index 13cbbc182257..267719069104 100644 --- a/.github/workflows/buildAndTest.yml +++ b/.github/workflows/buildAndTest.yml @@ -14,7 +14,7 @@ jobs: name: Sanity Check runs-on: ubuntu-latest container: - image: ghcr.io/circt/images/circt-ci-build:20240213211952 + image: ghcr.io/circt/images/circt-ci-build:20250425003355 steps: # Clone the CIRCT repo and its submodules. Do shallow clone to save clone # time. @@ -134,7 +134,7 @@ jobs: # John and re-run the job. runs-on: ["self-hosted", "1ES.Pool=1ES-CIRCT-builds", "linux"] container: - image: ghcr.io/circt/images/circt-ci-build:20240213211952 + image: ghcr.io/circt/images/circt-ci-build:20250425003355 volumes: - /mnt:/__w/circt strategy: From 4ee732bb44b2bf3cac846a3a37e3fa98a26cc946 Mon Sep 17 00:00:00 2001 From: Schuyler Eldridge Date: Fri, 25 Apr 2025 12:46:49 -0400 Subject: [PATCH 2/2] fixup! [ci] Bump CI images --- .github/workflows/buildAndTest.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/buildAndTest.yml b/.github/workflows/buildAndTest.yml index 267719069104..69a381080fcb 100644 --- a/.github/workflows/buildAndTest.yml +++ b/.github/workflows/buildAndTest.yml @@ -14,7 +14,7 @@ jobs: name: Sanity Check runs-on: ubuntu-latest container: - image: ghcr.io/circt/images/circt-ci-build:20250425003355 + image: ghcr.io/circt/images/circt-ci-build:20250425163230 steps: # Clone the CIRCT repo and its submodules. Do shallow clone to save clone # time. @@ -134,7 +134,7 @@ jobs: # John and re-run the job. runs-on: ["self-hosted", "1ES.Pool=1ES-CIRCT-builds", "linux"] container: - image: ghcr.io/circt/images/circt-ci-build:20250425003355 + image: ghcr.io/circt/images/circt-ci-build:20250425163230 volumes: - /mnt:/__w/circt strategy: @@ -191,7 +191,7 @@ jobs: path: | llvm/build/bin/llvm-lit llvm/install - key: ${{ runner.os }}-llvm-${{ steps.get-llvm-hash.outputs.hash }}-${{ steps.get-workflow-hash.outputs.hash }}-${{ matrix.compiler.cc }} + key: ${{ runner.os }}-llvm-${{ steps.get-llvm-hash.outputs.hash }}-${{ steps.get-workflow-hash.outputs.hash }}-${{ matrix.compiler.cc }} # Build LLVM if we didn't hit in the cache. Even though we build it in # the previous job, there is a low chance that it'll have been evicted by