Skip to content

Commit

Permalink
-trying to fix windows functional tests;
Browse files Browse the repository at this point in the history
  • Loading branch information
kamchatka-volcano committed Jun 12, 2024
1 parent 7f72a3d commit f0c78dd
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ jobs:
build:
name: ${{ matrix.config.name }}
runs-on: ${{ matrix.config.os }}
env:
CC: ${{ matrix.config.cc }}
CXX: ${{ matrix.config.cxx }}

strategy:
fail-fast: false
Expand All @@ -39,7 +36,7 @@ jobs:
}
- {
name: "Windows Latest MSVC",
os: windows-latest,
os: windows-2019,
cmake-preset: msvc-release,
cmake_vars: "",
asio_type: "standalone"
Expand All @@ -53,15 +50,15 @@ jobs:
}
- {
name: "Windows Latest MSVC (Boost.Asio)",
os: windows-latest,
os: windows-2019,
cmake-preset: msvc-release,
asio_type: "boost",
cmake_vars: "-DASYNCGI_USE_BOOST_ASIO=ON -DVCPKG_TARGET_TRIPLET=x64-windows-static-md -DCMAKE_TOOLCHAIN_FILE='vcpkg/scripts/buildsystems/vcpkg.cmake'"
}

steps:
- name: Install ninja (Windows)
if: matrix.config.os == 'windows-latest'
if: matrix.config.os == 'windows-2019'
run: choco install ninja
- name: Install ninja (Linux)
if: matrix.config.os == 'ubuntu-latest'
Expand Down Expand Up @@ -106,7 +103,7 @@ jobs:
config:
- {
name: "Windows",
os: "windows-latest",
os: "windows-2019",
lunchtoast_exec: "lunchtoast.exe",
shell_command: -shell="msys2 -c",
tags: -skip=linux,
Expand Down

0 comments on commit f0c78dd

Please sign in to comment.