diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index e1338f9..a4139b6 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -27,24 +27,21 @@ jobs: os: ubuntu-latest, cmake-preset: gcc-release, cmake_vars: "", - asio_type: "standalone", - artifacts-path-postfix: "" + asio_type: "standalone" } - { name: "Ubuntu Latest clang", os: ubuntu-latest, cmake-preset: clang-release, cmake_vars: "", - asio_type: "standalone", - artifacts-path-postfix: "" + asio_type: "standalone" } - { name: "Windows Latest MSVC", os: windows-latest, cmake-preset: msvc-release, cmake_vars: "", - asio_type: "standalone", - artifacts-path-postfix: "Release" + asio_type: "standalone" } - { name: "Ubuntu Latest clang (Boost.Asio)", @@ -52,15 +49,13 @@ jobs: cmake-preset: clang-release, asio_type: "boost", cmake_vars: "-DASYNCGI_USE_BOOST_ASIO=ON -DBoost_USE_STATIC_LIBS=ON -DBoost_USE_STATIC_RUNTIME=ON -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake", - artifacts-path-postfix: "" } - { name: "Windows Latest MSVC (Boost.Asio)", os: windows-latest, 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'", - artifacts-path-postfix: "Release" + cmake_vars: "-DASYNCGI_USE_BOOST_ASIO=ON -DVCPKG_TARGET_TRIPLET=x64-windows-static-md -DCMAKE_TOOLCHAIN_FILE='vcpkg/scripts/buildsystems/vcpkg.cmake'" } steps: @@ -91,13 +86,13 @@ jobs: uses: actions/upload-artifact@v3 with: name: asyncgi-examples-${{ matrix.config.os }}-${{ matrix.config.asio_type }}-asio - path: build/examples/${{ matrix.config.artifacts-path-postfix }} + path: build/examples/ - name: Upload build test artifact uses: actions/upload-artifact@v3 with: name: asyncgi-test-examples-${{ matrix.config.os }}-${{ matrix.config.asio_type }}-asio - path: build/test_examples/${{ matrix.config.artifacts-path-postfix }} + path: build/test_examples/ functional_tests: name: Functional testing (${{ matrix.config.name }} ${{ matrix.asio_type }}-asio)