Skip to content

Commit 1d394fd

Browse files
committed
Add minor reorganisation in basemap-for-windows
1 parent adfee80 commit 1d394fd

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -61,22 +61,22 @@ jobs:
6161
name: checkout
6262
path: .
6363
-
64-
name: Set Python
65-
uses: actions/setup-python@v2
66-
with:
67-
architecture: ${{ matrix.arch }}
68-
python-version: "3.6"
69-
-
70-
name: Setup MSVC toolset
64+
name: Set MSVC toolset
7165
uses: pylegacy/actions/setup-msvc@v1
7266
with:
7367
architecture: ${{ matrix.arch }}
7468
version: ${{ matrix.msvc-toolset }}
7569
-
76-
name: Install CMake
70+
name: Set CMake
7771
uses: jwlawson/actions-setup-cmake@v1.9
7872
with:
7973
cmake-version: ${{ matrix.cmake-version }}
74+
-
75+
name: Set Python
76+
uses: actions/setup-python@v2
77+
with:
78+
architecture: ${{ matrix.arch }}
79+
python-version: "3.6"
8080
-
8181
name: Build GEOS from source
8282
run: |
@@ -107,12 +107,6 @@ jobs:
107107
with:
108108
name: checkout
109109
path: .
110-
-
111-
name: Set Python
112-
uses: actions/setup-python@v2
113-
with:
114-
architecture: ${{ matrix.arch }}
115-
python-version: ${{ matrix.python-version }}
116110
-
117111
name: Set MSVC toolset version
118112
run: |
@@ -122,13 +116,19 @@ jobs:
122116
echo "msvc-toolset=14.16" >> $env:GITHUB_ENV
123117
}
124118
-
125-
name: Setup MSVC toolset
119+
name: Set MSVC toolset
126120
uses: pylegacy/actions/setup-msvc@v1
127121
with:
128122
architecture: ${{ matrix.arch }}
129123
version: ${{ env.msvc-toolset }}
130124
-
131-
name: Install Python base packages
125+
name: Set Python
126+
uses: actions/setup-python@v2
127+
with:
128+
architecture: ${{ matrix.arch }}
129+
python-version: ${{ matrix.python-version }}
130+
-
131+
name: Set Python base packages
132132
run: |
133133
python -m pip install --upgrade pip setuptools wheel
134134
-

0 commit comments

Comments
 (0)