diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 42744be4..ab26be67 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -20,17 +20,17 @@ jobs: build: strategy: matrix: - os: [ubuntu-24.04, windows-2022, macos-15] + os: [ubuntu-24.04, windows-2025, macos-15] runs-on: ${{ matrix.os }} steps: - - name: Setup llvm & ninja - if: matrix.os == 'windows-2022' + - name: Setup ninja + if: matrix.os == 'windows-2025' uses: MinoruSekine/setup-scoop@v4.0.1 with: buckets: main - apps: llvm ninja + apps: ninja - name: Setup llvm & libstdc++ & cmake & ninja if: matrix.os == 'ubuntu-24.04' @@ -63,7 +63,7 @@ jobs: curl -L "https://github.com/clice-project/llvm-binary/releases/download/20.0.0/x86_64-linux-gnu-debug.tar.xz" | tar -xJ -C ./.llvm - name: Setup llvm binary - if: matrix.os == 'windows-2022' + if: matrix.os == 'windows-2025' run: | curl -O -L "https://github.com/clice-project/llvm-binary/releases/download/20.0.0/x64-windows-msvc-release.7z" 7z x x64-windows-msvc-release.7z "-o.llvm" @@ -75,7 +75,7 @@ jobs: curl -L "https://github.com/clice-project/llvm-binary/releases/download/20.1.5/arm64-macosx-apple-debug.tar.xz" | tar -xJ -C ./.llvm - name: Setup msvc sysroot for cmake - if: matrix.os == 'windows-2022' + if: matrix.os == 'windows-2025' uses: ilammy/msvc-dev-cmd@v1 - name: Build clice (debug) @@ -92,7 +92,7 @@ jobs: cmake --build --preset debug -v - name: Build clice (release) - if: matrix.os == 'windows-2022' + if: matrix.os == 'windows-2025' run: | cmake --preset release cmake --build --preset release diff --git a/.github/workflows/xmake.yml b/.github/workflows/xmake.yml index c31989ac..7d229674 100644 --- a/.github/workflows/xmake.yml +++ b/.github/workflows/xmake.yml @@ -71,17 +71,11 @@ jobs: windows: strategy: matrix: - os: [windows-2022] + os: [windows-2025] runs-on: ${{ matrix.os }} steps: - - name: Setup llvm - uses: MinoruSekine/setup-scoop@v4.0.1 - with: - buckets: main - apps: llvm - - name: Checkout repository uses: actions/checkout@v4