From acd6f12d9e370e00de1ee6125c70a09cdcfae0ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81rni=20Dagur?= <arni@dagur.eu>
Date: Thu, 2 Mar 2023 23:36:53 +0100
Subject: Modernize CI

---
 .github/workflows/ci.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1beb8ae..d0fb0f8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -148,31 +148,31 @@ jobs:
           [
             {
               toolchain: "1.53",
-              manylinux: "2010",
+              manylinux: "2014",
               target: "x86_64-unknown-linux-gnu",
               arch: "x86_64",
               python-version: "3.7"
             },
             {
               toolchain: "nightly",
-              manylinux: "2010",
+              manylinux: "2014",
               target: "x86_64-unknown-linux-gnu",
               arch: "x86_64",
               python-version: "3.7"
             },
             {
               toolchain: "stable",
-              manylinux: "2010",
+              manylinux: "2014",
               target: "x86_64-unknown-linux-gnu",
               arch: "x86_64",
               python-version: "3.7"
             },
             {
               toolchain: "stable",
-              manylinux: "2010",
+              manylinux: "2014",
               target: "x86_64-unknown-linux-gnu",
               arch: "x86_64",
-              python-version: "3.10"
+              python-version: "3.11"
             }
           ]
     steps:
@@ -184,7 +184,7 @@ jobs:
 
       - name: Build Wheels
         run: |
-          echo 'curl --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain ${{ matrix.platform.toolchain }}
+          echo 'curl -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain ${{ matrix.platform.toolchain }}
           source ~/.cargo/env
           export PATH=/opt/python/cp38-cp38/bin:$PATH
           pip install maturin
@@ -245,6 +245,7 @@ jobs:
           echo 'curl -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable
           source ~/.cargo/env
           rustup target add ${{ matrix.platform.target }}
+          pip install maturin
           maturin build -i python --release --out dist --target ${{ matrix.platform.target }} --manylinux ${{ matrix.platform.manylinux }}
           ' > build-wheel.sh
           chmod +x build-wheel.sh
@@ -296,6 +297,7 @@ jobs:
 
       - name: Wheel filename sanity checks
         run: |
+          ls -lah
           num_abi3_whl=$(find | grep "\./adblock.*-abi3.*\.whl" | wc -l)
           num_whl=$(find | grep "\./adblock.*\.whl" | wc -l)
           test $num_abi3_whl -eq $num_whl
-- 
cgit v1.2.3