From a2bf3ecf92f965fd7037540925b67cbebb5d2994 Mon Sep 17 00:00:00 2001 From: Sergey Date: Sun, 5 Jun 2022 15:41:40 +0300 Subject: [PATCH 1/4] Update ci.yml --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d767a1a..ee1b080 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -103,6 +103,9 @@ jobs: set(ENV{${CMAKE_MATCH_1}} "${CMAKE_MATCH_2}") endif() endforeach() + execute_process( + COMMAND cmd /c "${{ matrix.config.environment_script }}" + ) endif() file(TO_CMAKE_PATH "$ENV{GITHUB_WORKSPACE}/ninja" ninja_program) From cba26037dd17843ca296f31b45ea62aed80b2e8c Mon Sep 17 00:00:00 2001 From: Sergey Date: Sun, 5 Jun 2022 15:47:44 +0300 Subject: [PATCH 2/4] Update ci.yml --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ee1b080..a279f78 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: name: "Windows Latest MSVC", artifact: "Windows.tar.xz", os: windows-latest, build_type: "Release", cc: "cl", cxx: "cl", - environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat" + environment_script: "\"C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat\"" } - { name: "Ubuntu Latest GCC", artifact: "Linux.tar.xz", @@ -153,6 +153,9 @@ jobs: set(ENV{${CMAKE_MATCH_1}} "${CMAKE_MATCH_2}") endif() endforeach() + execute_process( + COMMAND cmd /c "${{ matrix.config.environment_script }}" + ) endif() execute_process( From 091296dae4413f4df3ae59c45312141280a86d11 Mon Sep 17 00:00:00 2001 From: Sergey Date: Sun, 5 Jun 2022 15:53:24 +0300 Subject: [PATCH 3/4] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a279f78..9bb1892 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: name: "Windows Latest MSVC", artifact: "Windows.tar.xz", os: windows-latest, build_type: "Release", cc: "cl", cxx: "cl", - environment_script: "\"C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat\"" + environment_script: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat" } - { name: "Ubuntu Latest GCC", artifact: "Linux.tar.xz", From 9daf45a1be3b423edee9c364d744cfc7241e2085 Mon Sep 17 00:00:00 2001 From: Sergey Date: Sun, 5 Jun 2022 15:59:07 +0300 Subject: [PATCH 4/4] Update ci.yml --- .github/workflows/ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9bb1892..18d84da 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -103,9 +103,6 @@ jobs: set(ENV{${CMAKE_MATCH_1}} "${CMAKE_MATCH_2}") endif() endforeach() - execute_process( - COMMAND cmd /c "${{ matrix.config.environment_script }}" - ) endif() file(TO_CMAKE_PATH "$ENV{GITHUB_WORKSPACE}/ninja" ninja_program) @@ -153,9 +150,6 @@ jobs: set(ENV{${CMAKE_MATCH_1}} "${CMAKE_MATCH_2}") endif() endforeach() - execute_process( - COMMAND cmd /c "${{ matrix.config.environment_script }}" - ) endif() execute_process(