Skip to content

Commit 3e76640

Browse files
committed
Delegate setup-msvc action to external repo
1 parent fdaf5e8 commit 3e76640

File tree

2 files changed

+10
-58
lines changed

2 files changed

+10
-58
lines changed

.github/actions/setup-msvc/action.yml

Lines changed: 0 additions & 44 deletions
This file was deleted.

.github/workflows/basemap-for-windows.yml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ jobs:
2727
matrix:
2828
include:
2929
- arch: "x64"
30-
msvc-toolset: "16"
30+
msvc-toolset: "14.16"
3131
cmake-version: "3.14.7"
3232
- arch: "x86"
33-
msvc-toolset: "16"
33+
msvc-toolset: "14.16"
3434
cmake-version: "3.13.2"
3535
- arch: "x64"
36-
msvc-toolset: "9"
36+
msvc-toolset: "9.0"
3737
cmake-version: "3.14.7"
3838
- arch: "x86"
39-
msvc-toolset: "9"
39+
msvc-toolset: "9.0"
4040
cmake-version: "3.13.2"
4141
max-parallel: 4
4242
fail-fast: false
@@ -57,12 +57,10 @@ jobs:
5757
python-version: "3.6"
5858
-
5959
name: Setup MSVC toolset
60-
uses: ./.github/actions/setup-msvc
60+
uses: pylegacy/actions/setup-msvc@v1
6161
with:
62-
arch: ${{ matrix.arch }}
62+
architecture: ${{ matrix.arch }}
6363
version: ${{ matrix.msvc-toolset }}
64-
env:
65-
VS090URL: ${{ secrets.VS090URL }}
6664
-
6765
name: Install CMake
6866
uses: jwlawson/[email protected]
@@ -118,18 +116,16 @@ jobs:
118116
name: Set MSVC toolset version
119117
run: |
120118
if ("${{ matrix.python-version }}" -eq "2.7") {
121-
echo "msvc-toolset=9" >> $env:GITHUB_ENV
119+
echo "msvc-toolset=9.0" >> $env:GITHUB_ENV
122120
} else {
123-
echo "msvc-toolset=16" >> $env:GITHUB_ENV
121+
echo "msvc-toolset=14.16" >> $env:GITHUB_ENV
124122
}
125123
-
126124
name: Setup MSVC toolset
127-
uses: ./.github/actions/setup-msvc
125+
uses: pylegacy/actions/setup-msvc@v1
128126
with:
129-
arch: ${{ matrix.arch }}
127+
architecture: ${{ matrix.arch }}
130128
version: ${{ env.msvc-toolset }}
131-
env:
132-
VS090URL: ${{ secrets.VS090URL }}
133129
-
134130
name: Install Python base packages
135131
run: |

0 commit comments

Comments
 (0)