From 15ee1c9faeb109483c043a4293e7557e4ca6bade Mon Sep 17 00:00:00 2001
From: Matthias Hochsteger <mhochsteger@cerbsim.com>
Date: Sat, 15 Jun 2024 23:46:45 +0200
Subject: [PATCH] Pip - build recent py versions first, upload them immediately
 on linux

---
 .gitlab-ci.yml     | 16 ++++++++--------
 tests/build_pip.sh |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4f67b011..6db9d067 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -276,11 +276,11 @@ pip_windows:
     - pip
     - windows
   script:
-    - .\tests\build_pip.ps1 C:\Python38
-    - .\tests\build_pip.ps1 C:\Python39
-    - .\tests\build_pip.ps1 C:\Python310
-    - .\tests\build_pip.ps1 C:\Python311
     - .\tests\build_pip.ps1 C:\Python312
+    - .\tests\build_pip.ps1 C:\Python311
+    - .\tests\build_pip.ps1 C:\Python310
+    - .\tests\build_pip.ps1 C:\Python39
+    - .\tests\build_pip.ps1 C:\Python38
   when: manual
 
 pip_macos:
@@ -290,9 +290,9 @@ pip_macos:
     - macosx
     - m1
   script:
-    - ./tests/build_pip_mac.sh 3.8
-    - ./tests/build_pip_mac.sh 3.9
-    - ./tests/build_pip_mac.sh 3.10
-    - ./tests/build_pip_mac.sh 3.11
     - ./tests/build_pip_mac.sh 3.12
+    - ./tests/build_pip_mac.sh 3.11
+    - ./tests/build_pip_mac.sh 3.10
+    - ./tests/build_pip_mac.sh 3.9
+    - ./tests/build_pip_mac.sh 3.8
   when: manual
diff --git a/tests/build_pip.sh b/tests/build_pip.sh
index ec659971..062474ec 100755
--- a/tests/build_pip.sh
+++ b/tests/build_pip.sh
@@ -19,7 +19,7 @@ export NETGEN_CCACHE=1
 
 /opt/python/cp39-cp39/bin/python tests/fix_auditwheel_policy.py
 
-for pyversion in 38 39 310 311 312
+for pyversion in 312 311 310 39 38
 do
     export PYDIR="/opt/python/cp${pyversion}-cp${pyversion}/bin"
     echo $PYDIR
@@ -33,9 +33,9 @@ do
 
     $PYDIR/pip install wheelhouse/netgen_mesher*-cp${pyversion}-*.whl
     $PYDIR/python3 -c 'import netgen'
+    $PYDIR/pip install -U twine
+    $PYDIR/twine upload --skip-existing wheelhouse/netgen_mesher*-cp${pyversion}*manylinux*.whl
     #cd ../tests/pytest
     #$PYDIR/python3 -m pytest
 done
 
-$PYDIR/pip install -U twine
-$PYDIR/twine upload wheelhouse/*manylinux*.whl