Skip to content

Commit c20a6a5

Browse files
committed
Backport GitHub workflow upgrade from develop branch
1 parent 0d3bd3b commit c20a6a5

File tree

4 files changed

+23
-28
lines changed

4 files changed

+23
-28
lines changed

.github/workflows/basemap-data-hires.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: basemap-data-hires
22

33
env:
44
PKGDIR: "packages/basemap_data_hires"
5+
PYTHONWARNINGS: "ignore:DEPRECATION"
6+
PIP_DISABLE_PIP_VERSION_CHECK: "1"
57

68
on:
79
push:
@@ -21,7 +23,7 @@ jobs:
2123
steps:
2224
-
2325
name: Checkout
24-
uses: actions/checkout@v2
26+
uses: actions/checkout@v3
2527
-
2628
name: Upload checkout
2729
uses: actions/upload-artifact@v1

.github/workflows/basemap-data.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: basemap-data
22

33
env:
44
PKGDIR: "packages/basemap_data"
5+
PYTHONWARNINGS: "ignore:DEPRECATION"
6+
PIP_DISABLE_PIP_VERSION_CHECK: "1"
57

68
on:
79
push:
@@ -21,7 +23,7 @@ jobs:
2123
steps:
2224
-
2325
name: Checkout
24-
uses: actions/checkout@v2
26+
uses: actions/checkout@v3
2527
-
2628
name: Upload checkout
2729
uses: actions/upload-artifact@v1

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: basemap-for-manylinux
22

33
env:
44
PKGDIR: "packages/basemap"
5+
PYTHONWARNINGS: "ignore:DEPRECATION"
6+
PIP_DISABLE_PIP_VERSION_CHECK: "1"
57

68
on:
79
push:
@@ -21,7 +23,7 @@ jobs:
2123
steps:
2224
-
2325
name: Checkout
24-
uses: actions/checkout@v2
26+
uses: actions/checkout@v3
2527
-
2628
name: Upload checkout
2729
uses: actions/upload-artifact@v1

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

+14-25
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: basemap-for-windows
22

33
env:
44
PKGDIR: "packages/basemap"
5+
PYTHONWARNINGS: "ignore:DEPRECATION"
6+
PIP_DISABLE_PIP_VERSION_CHECK: "1"
57

68
on:
79
push:
@@ -21,7 +23,7 @@ jobs:
2123
steps:
2224
-
2325
name: Checkout
24-
uses: actions/checkout@v2
26+
uses: actions/checkout@v3
2527
-
2628
name: Upload checkout
2729
uses: actions/upload-artifact@v1
@@ -47,7 +49,7 @@ jobs:
4749
path: .
4850
-
4951
name: Set Python
50-
uses: actions/setup-python@v2
52+
uses: actions/setup-python@v4
5153
with:
5254
architecture: ${{ matrix.arch }}
5355
python-version: ${{ matrix.python-version }}
@@ -85,23 +87,10 @@ jobs:
8587
build-geos:
8688
strategy:
8789
matrix:
88-
include:
89-
-
90-
arch: "x64"
91-
msvc-toolset: "14.16"
92-
cmake-version: "3.14.7"
93-
-
94-
arch: "x86"
95-
msvc-toolset: "14.16"
96-
cmake-version: "3.13.2"
97-
-
98-
arch: "x64"
99-
msvc-toolset: "9.0"
100-
cmake-version: "3.14.7"
101-
-
102-
arch: "x86"
103-
msvc-toolset: "9.0"
104-
cmake-version: "3.13.2"
90+
arch:
91+
["x64", "x86"]
92+
msvc-toolset:
93+
["9.0", "14.16"]
10594
max-parallel: 4
10695
fail-fast: false
10796
needs: lint
@@ -121,12 +110,12 @@ jobs:
121110
version: ${{ matrix.msvc-toolset }}
122111
-
123112
name: Set CMake
124-
uses: jwlawson/actions-setup-cmake@v1.9
113+
uses: jwlawson/actions-setup-cmake@v1.13
125114
with:
126-
cmake-version: ${{ matrix.cmake-version }}
115+
cmake-version: "3.14.7"
127116
-
128117
name: Set Python
129-
uses: actions/setup-python@v2
118+
uses: actions/setup-python@v4
130119
with:
131120
architecture: ${{ matrix.arch }}
132121
python-version: "3.6"
@@ -176,7 +165,7 @@ jobs:
176165
version: ${{ env.msvc-toolset }}
177166
-
178167
name: Set Python
179-
uses: actions/setup-python@v2
168+
uses: actions/setup-python@v4
180169
with:
181170
architecture: ${{ matrix.arch }}
182171
python-version: ${{ matrix.python-version }}
@@ -229,7 +218,7 @@ jobs:
229218
steps:
230219
-
231220
name: Set Python
232-
uses: actions/setup-python@v2
221+
uses: actions/setup-python@v4
233222
with:
234223
architecture: ${{ matrix.arch }}
235224
python-version: ${{ matrix.python-version }}
@@ -264,7 +253,7 @@ jobs:
264253
steps:
265254
-
266255
name: Set Python
267-
uses: actions/setup-python@v2
256+
uses: actions/setup-python@v4
268257
with:
269258
architecture: ${{ matrix.arch }}
270259
python-version: ${{ matrix.python-version }}

0 commit comments

Comments
 (0)