From a1005c7c76a74370f4f4d1532ca8dc22b8a4c824 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 19 Feb 2023 17:25:35 -0800 Subject: [PATCH] github CI: use ilammy/msvc-dev-cmd Small simplification Signed-off-by: Rosen Penev --- .github/workflows/on_PR_windows_matrix.yml | 12 +----------- .github/workflows/on_push_BasicWinLinMac.yml | 12 +----------- .github/workflows/release.yml | 12 +----------- 3 files changed, 3 insertions(+), 33 deletions(-) diff --git a/.github/workflows/on_PR_windows_matrix.yml b/.github/workflows/on_PR_windows_matrix.yml index 4d95daf4..5741dd63 100644 --- a/.github/workflows/on_PR_windows_matrix.yml +++ b/.github/workflows/on_PR_windows_matrix.yml @@ -33,20 +33,10 @@ jobs: - uses: actions/checkout@v3 - name: Set up Visual Studio shell - uses: egor-tensin/vs-shell@v2 + uses: ilammy/msvc-dev-cmd@v1 with: arch: ${{matrix.platform}} - - name: Set up Ninja - uses: ashutoshvarma/setup-ninja@master - with: - version: 1.10.0 - - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: 3.7 - - name: Restore Conan cache uses: actions/cache@v3 with: diff --git a/.github/workflows/on_push_BasicWinLinMac.yml b/.github/workflows/on_push_BasicWinLinMac.yml index 368f6426..5dfdd2c1 100644 --- a/.github/workflows/on_push_BasicWinLinMac.yml +++ b/.github/workflows/on_push_BasicWinLinMac.yml @@ -22,21 +22,11 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Setup Ninja - uses: ashutoshvarma/setup-ninja@master - with: - version: 1.10.0 - - name: Set up Visual Studio shell - uses: egor-tensin/vs-shell@v2 + uses: ilammy/msvc-dev-cmd@v1 with: arch: x64 - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: 3.7 - - name: Restore conan cache uses: actions/cache@v3 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e120f44d..9c595050 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -98,17 +98,7 @@ jobs: - uses: actions/checkout@v3 - name: Set up Visual Studio shell - uses: egor-tensin/vs-shell@v2 - - - name: Setup Ninja - uses: ashutoshvarma/setup-ninja@master - with: - version: 1.10.0 - - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: 3.7 + uses: ilammy/msvc-dev-cmd@v1 - name: Install doxygen run: |