From c20a6a5bf90eacd3f9ba0a76cd12929c3843811d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?= Date: Mon, 24 Oct 2022 19:42:55 +0200 Subject: [PATCH] Backport GitHub workflow upgrade from develop branch --- .github/workflows/basemap-data-hires.yml | 4 ++- .github/workflows/basemap-data.yml | 4 ++- .github/workflows/basemap-for-manylinux.yml | 4 ++- .github/workflows/basemap-for-windows.yml | 39 ++++++++------------- 4 files changed, 23 insertions(+), 28 deletions(-) diff --git a/.github/workflows/basemap-data-hires.yml b/.github/workflows/basemap-data-hires.yml index 6f6c53687..fbd1a9eb5 100644 --- 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 index 51e0aed96..c63c9a5d8 100644 --- 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 index f66b31b5e..c7e0d83f9 100644 --- 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 index c6acc57a6..d9e68ce25 100644 --- 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 }}