diff --git a/.github/workflows/cpp-linux.yml b/.github/workflows/cpp-linux.yml index ab474dd..cbcf20f 100644 --- a/.github/workflows/cpp-linux.yml +++ b/.github/workflows/cpp-linux.yml @@ -9,16 +9,18 @@ on: # yamllint disable-line rule:truthy branches: ["main"] workflow_dispatch: +env: + VCPKG_VERSION: 2026.07.29 + jobs: test: name: C/C++ CMake CI Test strategy: matrix: os: - - "ubuntu-24.04" - - "ubuntu-24.04-arm" - "ubuntu-26.04" - "ubuntu-26.04-arm" + runs-on: ${{ matrix.os }} steps: @@ -28,12 +30,21 @@ jobs: - name: Install shell: bash run: | - echo "VCPKG_ROOT=/usr/local/share/vcpkg" >> $GITHUB_ENV + export VCPKG_VERSION=${VCPKG_VERSION} + git clone \ + --branch $VCPKG_VERSION \ + https://github.com/microsoft/vcpkg.git \ + --single-branch \ + "$HOME/vcpkg" + export VCPKG_ROOT="$HOME/vcpkg" + echo "$VCPKG_ROOT" >> $GITHUB_PATH + sh $VCPKG_ROOT/bootstrap-vcpkg.sh + echo "VCPKG_ROOT=$HOME/vcpkg" >> $GITHUB_ENV - name: Check Tools run: | echo "-----------" - c++ --version + cc --version echo "-----------" make --version echo "-----------" diff --git a/.github/workflows/cpp-macos.yml b/.github/workflows/cpp-macos.yml index 701b4df..6773ef5 100644 --- a/.github/workflows/cpp-macos.yml +++ b/.github/workflows/cpp-macos.yml @@ -18,11 +18,11 @@ jobs: strategy: matrix: os: - - "macos-14" - "macos-15" - "macos-15-intel" - "macos-26" - "macos-26-intel" + runs-on: ${{ matrix.os }} steps: @@ -46,7 +46,7 @@ jobs: - name: Check Tools run: | echo "-----------" - c++ --version + cc --version echo "-----------" make --version echo "-----------" diff --git a/.github/workflows/cpp-windows.yml b/.github/workflows/cpp-windows.yml index 591f831..1504215 100644 --- a/.github/workflows/cpp-windows.yml +++ b/.github/workflows/cpp-windows.yml @@ -15,12 +15,8 @@ jobs: strategy: matrix: os: - - "windows-2022" + - "windows-11-arm" - "windows-2025" - arch: - - amd64 - - amd64_x86 - # - amd64_arm64 runs-on: ${{ matrix.os }} @@ -33,6 +29,17 @@ jobs: run: | echo "VCPKG_ROOT=C:/vcpkg" >> $GITHUB_ENV + - name: Setup MSVC + uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 + + - name: Check MSVC + shell: cmd + run: | + where cl + cl + where link + where ml64 + - name: Check Tools run: | echo "-----------" @@ -45,11 +52,6 @@ jobs: vcpkg --version echo "-----------" - # yamllint disable rule:line-length - - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0 - with: - arch: ${{ matrix.arch }} - # yamllint enable rule:line-length - name: Install dependencies run: | vcpkg --x-wait-for-lock integrate install