From e218ebcea327ea12e1e70c3e3973594044c519c9 Mon Sep 17 00:00:00 2001
From: Vincent Emonet <vincent.emonet@gmail.com>
Date: Thu, 7 Mar 2024 08:14:35 +0100
Subject: [PATCH] improve workflow

---
 .github/workflows/build.yml          |  6 +++---
 .github/workflows/manylinux_build.sh | 21 ---------------------
 .github/workflows/musllinux_build.sh | 19 -------------------
 3 files changed, 3 insertions(+), 43 deletions(-)
 delete mode 100755 .github/workflows/manylinux_build.sh
 delete mode 100755 .github/workflows/musllinux_build.sh

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e289310..cf3d6f9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -168,7 +168,7 @@ jobs:
           - os: linux
             manylinux: auto
             target: x86_64
-            interpreter: pypy3.8 pypy3.9 pypy3.10 3.11 3.12
+            interpreter: 3.8 3.9 3.10 3.11 3.12 pypy3.8 pypy3.9 pypy3.10
 
           # musllinux
           - os: linux
@@ -185,7 +185,7 @@ jobs:
             target: x86_64
           - os: macos
             target: aarch64
-            interpreter: 3.8 3.9 pypy3.9 pypy3.10
+            interpreter: 3.8 3.9 3.10 3.11 3.12 pypy3.9 pypy3.10
 
           # windows
           # x86_64 pypy builds are not PGO optimized, i686 not supported by pypy, aarch64 only 3.11 and up, also not PGO optimized
@@ -200,7 +200,7 @@ jobs:
           # Ring cant target win aarch64 https://github.com/briansmith/ring/issues/1167
           - os: windows
             target: aarch64
-            interpreter: 3.11 3.12
+            interpreter: 3.9 3.10 3.11 3.12
 
 
     runs-on: ${{ (matrix.os == 'linux' && 'ubuntu') || matrix.os }}-latest
diff --git a/.github/workflows/manylinux_build.sh b/.github/workflows/manylinux_build.sh
deleted file mode 100755
index e5037a0..0000000
--- a/.github/workflows/manylinux_build.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-cd /workdir
-yum -y install centos-release-scl-rh
-yum -y install llvm-toolset-7.0
-source scl_source enable llvm-toolset-7.0
-curl https://static.rust-lang.org/rustup/dist/%arch%-unknown-linux-gnu/rustup-init --output rustup-init
-chmod +x rustup-init
-./rustup-init -y --profile minimal
-source "$HOME/.cargo/env"
-export PATH="${PATH}:/opt/python/cp37-cp37m/bin:/opt/python/cp38-cp38/bin:/opt/python/cp39-cp39/bin:/opt/python/cp310-cp310/bin:/opt/python/cp311-cp311/bin"
-cd python
-python3.10 -m venv venv
-source venv/bin/activate
-pip install -r requirements.dev.txt
-maturin develop --release -m Cargo.toml
-# python generate_stubs.py pyoxigraph pyoxigraph.pyi --black
-maturin build --release -m Cargo.toml --compatibility manylinux2014
-if [ %for_each_version% ]; then
-  for VERSION in 7 8 9 10 11; do
-    maturin build --release -m Cargo.toml --interpreter "python3.$VERSION" --compatibility manylinux2014
-  done
-fi
\ No newline at end of file
diff --git a/.github/workflows/musllinux_build.sh b/.github/workflows/musllinux_build.sh
deleted file mode 100755
index 8842441..0000000
--- a/.github/workflows/musllinux_build.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-cd /workdir
-apk add clang-dev
-curl https://static.rust-lang.org/rustup/dist/%arch%-unknown-linux-musl/rustup-init --output rustup-init
-chmod +x rustup-init
-./rustup-init -y --profile minimal
-source "$HOME/.cargo/env"
-export PATH="${PATH}:/opt/python/cp37-cp37m/bin:/opt/python/cp38-cp38/bin:/opt/python/cp39-cp39/bin:/opt/python/cp310-cp310/bin:/opt/python/cp311-cp311/bin"
-cd python
-python3.10 -m venv venv
-source venv/bin/activate
-pip install -r requirements.dev.txt
-maturin develop --release -m Cargo.toml
-# python generate_stubs.py pyoxigraph pyoxigraph.pyi --black
-maturin build --release -m Cargo.toml --compatibility musllinux_1_1
-if [ %for_each_version% ]; then
-  for VERSION in 7 8 9 10 11; do
-    maturin build --release -m Cargo.toml --interpreter "python3.$VERSION" --compatibility musllinux_1_1
-  done
-fi
\ No newline at end of file