Backport GitHub workflow upgrade from develop branch

matplotlib · Oct 24, 2022 · c20a6a5 · c20a6a5
1 parent 0d3bd3b
commit c20a6a5
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 28 deletions.
diff --git a/.github/workflows/basemap-data-hires.yml b/.github/workflows/basemap-data-hires.yml
@@ -2,6 +2,8 @@ name: basemap-data-hires
 
 env:
   PKGDIR: "packages/basemap_data_hires"
+  PYTHONWARNINGS: "ignore:DEPRECATION"
+  PIP_DISABLE_PIP_VERSION_CHECK: "1"
 
 on:
   push:
@@ -21,7 +23,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Upload checkout
         uses: actions/upload-artifact@v1

diff --git a/.github/workflows/basemap-data.yml b/.github/workflows/basemap-data.yml
@@ -2,6 +2,8 @@ name: basemap-data
 
 env:
   PKGDIR: "packages/basemap_data"
+  PYTHONWARNINGS: "ignore:DEPRECATION"
+  PIP_DISABLE_PIP_VERSION_CHECK: "1"
 
 on:
   push:
@@ -21,7 +23,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Upload checkout
         uses: actions/upload-artifact@v1

diff --git a/.github/workflows/basemap-for-manylinux.yml b/.github/workflows/basemap-for-manylinux.yml
@@ -2,6 +2,8 @@ name: basemap-for-manylinux
 
 env:
   PKGDIR: "packages/basemap"
+  PYTHONWARNINGS: "ignore:DEPRECATION"
+  PIP_DISABLE_PIP_VERSION_CHECK: "1"
 
 on:
   push:
@@ -21,7 +23,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Upload checkout
         uses: actions/upload-artifact@v1

diff --git a/.github/workflows/basemap-for-windows.yml b/.github/workflows/basemap-for-windows.yml
@@ -2,6 +2,8 @@ name: basemap-for-windows
 
 env:
   PKGDIR: "packages/basemap"
+  PYTHONWARNINGS: "ignore:DEPRECATION"
+  PIP_DISABLE_PIP_VERSION_CHECK: "1"
 
 on:
   push:
@@ -21,7 +23,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Upload checkout
         uses: actions/upload-artifact@v1
@@ -47,7 +49,7 @@ jobs:
           path: .
       -
         name: Set Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           architecture: ${{ matrix.arch }}
           python-version: ${{ matrix.python-version }}
@@ -85,23 +87,10 @@ jobs:
   build-geos:
     strategy:
       matrix:
-        include:
-          - 
-            arch: "x64"
-            msvc-toolset: "14.16"
-            cmake-version: "3.14.7"
-          - 
-            arch: "x86"
-            msvc-toolset: "14.16"
-            cmake-version: "3.13.2"
-          - 
-            arch: "x64"
-            msvc-toolset: "9.0"
-            cmake-version: "3.14.7"
-          - 
-            arch: "x86"
-            msvc-toolset: "9.0"
-            cmake-version: "3.13.2"
+        arch:
+          ["x64", "x86"]
+        msvc-toolset:
+          ["9.0", "14.16"]
       max-parallel: 4
       fail-fast: false
     needs: lint
@@ -121,12 +110,12 @@ jobs:
           version: ${{ matrix.msvc-toolset }}
       -
         name: Set CMake
-        uses: jwlawson/actions-setup-cmake@v1.9
+        uses: jwlawson/actions-setup-cmake@v1.13
         with:
-          cmake-version: ${{ matrix.cmake-version }}
+          cmake-version: "3.14.7"
       -
         name: Set Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           architecture: ${{ matrix.arch }}
           python-version: "3.6"
@@ -176,7 +165,7 @@ jobs:
           version: ${{ env.msvc-toolset }}
       -
         name: Set Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           architecture: ${{ matrix.arch }}
           python-version: ${{ matrix.python-version }}
@@ -229,7 +218,7 @@ jobs:
     steps:
       -
         name: Set Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           architecture: ${{ matrix.arch }}
           python-version: ${{ matrix.python-version }}
@@ -264,7 +253,7 @@ jobs:
     steps:
       -
         name: Set Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           architecture: ${{ matrix.arch }}
           python-version: ${{ matrix.python-version }}