Skip to content

Commit a51aab9

Browse files
sergey-dryabzhinskysergey-dryabzhinsky
authored
Merge pull request #227 from sergey-dryabzhinsky/pull-225-multiple-instances-of-interpreter-new-version-1567
Pull 225 multiple instances of interpreter new version 1567
2 parents d34e645 + 4c3ec67 commit a51aab9

27 files changed

+166
-138
lines changed

‎.github/workflows/Build_wheels_for_cpython27_x86.yml‎

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build wheels for CPython2.7 x86 with Clang-7 with All warnings
1+
name: Build wheels for CPython2.7 x86 on Ubuntu18 with GCC-7 with All warnings
22

33
on: [push, pull_request]
44

@@ -14,19 +14,19 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
os:
17-
- name: Ubuntu 24+16 i386 CPython 2.7
17+
- name: Ubuntu 24+18 i386 CPython 2.7
1818
runs-on: ubuntu-latest
1919
matrix: linux
2020
arch: i386
2121
tag_arch: i686
22-
release: xenial
22+
release: bionic
2323
mirror: http://azure.archive.ubuntu.com/ubuntu
24-
version: 1.5.6.6
24+
#version: 1.5.6.7
2525
#pyver: "2.7"
2626
getpipurl: https://bootstrap.pypa.io/pip/2.7/get-pip.py
2727
pypkg: python2.7
2828
pyengine_tag: cp27-cp27mu
29-
libc_tag: manylinux_2_3
29+
libc_tag: manylinux_2_4
3030
steps:
3131
- name: Checkout code
3232
uses: actions/checkout@v4
@@ -54,7 +54,7 @@ jobs:
5454
- name: Debootstrap Ubuntu ${{matrix.os.release}} ${{matrix.os.arch}}
5555
if: matrix.os.matrix == 'linux'
5656
run: |
57-
sudo debootstrap --no-merged-usr --verbose --include=sudo,wget,curl,gnupg,apt-transport-https,ca-certificates --arch=${{matrix.os.arch}} ${{matrix.os.release}} ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} ${{matrix.os.mirror}} || tail ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}}/debootstrap/debootstrap.log
57+
sudo debootstrap --no-merged-usr --verbose --include=sudo,wget,curl,gnupg,ca-certificates --arch=${{matrix.os.arch}} ${{matrix.os.release}} ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} ${{matrix.os.mirror}} || tail ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}}/debootstrap/debootstrap.log
5858
5959
- name: Update and Upgrade Ubuntu ${{matrix.os.release}}
6060
if: matrix.os.matrix == 'linux'
@@ -67,7 +67,7 @@ jobs:
6767
echo " deb [trusted=yes] http://packages.rusoft.ru/ppa/rusoft/backports ubuntu-${{matrix.os.release}} main" > rusoft-backports.list
6868
echo " deb [trusted=yes] http://packages.rusoft.ru/ppa/rusoft/packages ubuntu-${{matrix.os.release}} main" > rusoft-packages.list
6969
echo " deb [trusted=yes] http://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu ${{matrix.os.release}} main" > deadsnakes.list
70-
echo " deb [trusted=yes] http://apt.llvm.org/${{matrix.os.release}}/ llvm-toolchain-${{matrix.os.release}}-7 main " > clang.list
70+
echo "# deb [trusted=yes] http://apt.llvm.org/${{matrix.os.release}}/ llvm-toolchain-${{matrix.os.release}}-18 main " > clang.list
7171
7272
false && sudo find ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} -iname apt
7373
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /usr/bin/apt update
@@ -77,7 +77,7 @@ jobs:
7777
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c 'cd /etc/apt/trusted.gpg.d && wget http://packages.rusoft.ru/apt/public-old.gpg -Orusoft-old.gpg'
7878
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c 'apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys A2CE4BCCC50209DD || true'
7979
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /usr/bin/apt update
80-
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /usr/bin/apt upgrade -y
80+
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /usr/bin/apt dist-upgrade -y
8181
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /usr/bin/apt -fy install
8282
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /usr/bin/apt upgrade -y
8383
@@ -90,38 +90,45 @@ jobs:
9090
- name: Pepare for ${{matrix.os.pypkg}} ${{matrix.os.arch}}
9191
if: matrix.os.matrix == 'linux'
9292
run: |
93-
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /usr/bin/apt install -y ${{matrix.os.pypkg}}-dev gcc clang-7 pkg-config ${{matrix.os.pypkgadd}}
93+
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /usr/bin/apt-cache madison clang-18
94+
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /usr/bin/apt install -y ${{matrix.os.pypkg}}-dev gcc pkg-config ${{matrix.os.pypkgadd}}
9495
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "wget ${{matrix.os.getpipurl}} -O get-pip.py && ${{matrix.os.pypkg}} get-pip.py"
9596
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "${{matrix.os.pypkg}} -m pip install -U 'setuptools<72.0'"
9697
9798
- name: Pepare source and build wheel for ${{matrix.os.pypkg}} ${{matrix.os.arch}}
9899
if: matrix.os.matrix == 'linux'
99100
run: |
100101
sudo mkdir -p ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}}/build_wheel/
101-
sudo tar -xvf dist/zstd-${{matrix.os.version}}.tar.gz -C ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}}/build_wheel/
102+
version=`cat version`
103+
echo "$version"
104+
sudo tar -xvf dist/zstd-$version.tar.gz -C ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}}/build_wheel/
102105
false && sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} env
103106
104107
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} pkg-config libzstd --modversion
105108
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} echo GCC
106109
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} gcc -v
107-
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} echo Clang
108-
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} clang-7 -v
109-
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "cd /build_wheel/zstd-${{matrix.os.version}} && ZSTD_ASM=1 CC=clang-7 ZSTD_WARNINGS=1 _ZSTD_WERRORS=1 _ZSTD_SMALL=1 _ZSTD_ASM_BMI2=1 ZSTD_THREADS=1 _ZSTD_EXTERNAL=1 ${{matrix.os.pypkg}} setup.py bdist_wheel "
110+
false && sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} echo CLANG
111+
false && dead sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} clang-18 -v
112+
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "cd /build_wheel/zstd-$version && ZSTD_ASM=1 ZSTD_WARNINGS=1 _ZSTD_WERRORS=1 _ZSTD_SMALL=1 _ZSTD_ASM_BMI2=1 ZSTD_THREADS=1 _ZSTD_EXTERNAL=1 ${{matrix.os.pypkg}} setup.py bdist_wheel "
110113
111114
- name: Test wheel for ${{matrix.os.pypkg}} ${{matrix.os.arch}}
112115
if: matrix.os.matrix == 'linux'
113116
run: |
114117
false && sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} find /build_wheel/
115-
sudo cp -v glibc-check.sh ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}}/build_wheel/zstd-${{matrix.os.version}}/
116-
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "cd /build_wheel/zstd-${{matrix.os.version}}/ ; echo LLH; ls -lh build/*/zstd.so; echo LDD; ldd build/*/zstd.so;echo FILE; file build/*/zstd.so; echo LIBC; bash ./glibc-check.sh build/*/zstd.so"
117-
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "cd /build_wheel/zstd-${{matrix.os.version}} && ${{matrix.os.pypkg}} setup.py test"
118+
version=`cat version`
119+
echo version=$version
120+
sudo cp -v glibc-check.sh ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}}/build_wheel/zstd-$version/
121+
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "cd /build_wheel/zstd-$version/ ; echo LLH; ls -lh build/*/zstd.so; echo LDD; ldd build/*/zstd.so;echo FILE; file build/*/zstd.so; echo LIBC; bash ./glibc-check.sh build/*/zstd.so"
122+
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "cd /build_wheel/zstd-$version && ${{matrix.os.pypkg}} setup.py test"
118123
119124
- name: Pepare wheel for upload
120125
if: matrix.os.matrix == 'linux'
121126
run: |
122-
sudo cp -v ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}}/build_wheel/zstd-${{matrix.os.version}}/dist/* ./dist
127+
version=`cat version`
128+
echo version=$version
129+
sudo cp -v ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}}/build_wheel/zstd-$version/dist/* ./dist
123130
sudo ls -lh ./dist/*
124-
sudo mv -v ./dist/"zstd-${{matrix.os.version}}-${{matrix.os.pyengine_tag}}-linux_${{matrix.os.tag_arch}}.whl" ./dist/"zstd-${{matrix.os.version}}-${{matrix.os.pyengine_tag}}-${{matrix.os.libc_tag}}_${{matrix.os.tag_arch}}.whl"
131+
sudo mv -v ./dist/"zstd-$version-${{matrix.os.pyengine_tag}}-linux_${{matrix.os.tag_arch}}.whl" ./dist/"zstd-$version-${{matrix.os.pyengine_tag}}-${{matrix.os.libc_tag}}_${{matrix.os.tag_arch}}.whl"
125132
126133
127134
- name: Test for secrets access

‎.github/workflows/Build_wheels_for_cpython27_x86_64.yml‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build wheels for CPython2.7 x64 with Clang-7 with All warnings
1+
name: Build wheels for CPython2.7 x64 on Ubuntu18 with GCC-7 with All warnings
22

33
on: [push, pull_request]
44

@@ -14,19 +14,19 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
os:
17-
- name: Ubuntu 24+16 amd64 CPython 2.7
17+
- name: Ubuntu 24+18 amd64 CPython 2.7
1818
runs-on: ubuntu-latest
1919
matrix: linux
2020
arch: amd64
2121
tag_arch: x86_64
22-
release: xenial
22+
release: bionic
2323
mirror: http://azure.archive.ubuntu.com/ubuntu
24-
version: 1.5.6.6
24+
#version: 1.5.6.7
2525
#pyver: "2.7"
2626
getpipurl: https://bootstrap.pypa.io/pip/2.7/get-pip.py
2727
pypkg: python2.7
2828
pyengine_tag: cp27-cp27mu
29-
libc_tag: manylinux_2_14
29+
libc_tag: manylinux_2_4
3030
steps:
3131
- name: Checkout code
3232
uses: actions/checkout@v4
@@ -54,7 +54,7 @@ jobs:
5454
- name: Debootstrap Ubuntu ${{matrix.os.release}} ${{matrix.os.arch}}
5555
if: matrix.os.matrix == 'linux'
5656
run: |
57-
sudo debootstrap --no-merged-usr --verbose --include=sudo,wget,curl,gnupg,apt-transport-https,ca-certificates --arch=${{matrix.os.arch}} ${{matrix.os.release}} ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} ${{matrix.os.mirror}} || tail ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}}/debootstrap/debootstrap.log
57+
sudo debootstrap --no-merged-usr --verbose --include=sudo,wget,curl,gnupg,ca-certificates --arch=${{matrix.os.arch}} ${{matrix.os.release}} ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} ${{matrix.os.mirror}} || tail ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}}/debootstrap/debootstrap.log
5858
5959
- name: Update and Upgrade Ubuntu ${{matrix.os.release}}
6060
if: matrix.os.matrix == 'linux'
@@ -66,7 +66,7 @@ jobs:
6666
echo " deb [trusted=yes] http://packages.rusoft.ru/ppa/rusoft/python ubuntu-${{matrix.os.release}} main" > rusoft-python.list
6767
echo " deb [trusted=yes] http://packages.rusoft.ru/ppa/rusoft/backports ubuntu-${{matrix.os.release}} main" > rusoft-backports.list
6868
echo " deb [trusted=yes] http://packages.rusoft.ru/ppa/rusoft/packages ubuntu-${{matrix.os.release}} main" > rusoft-packages.list
69-
echo " deb [trusted=yes] http://apt.llvm.org/xenial/ llvm-toolchain-${{matrix.os.release}}-7 main " > clang.list
69+
echo "# deb [trusted=yes] http://apt.llvm.org/${{matrix.os.release}}/ llvm-toolchain-${{matrix.os.release}}-16 main " > clang.list
7070
echo "# deb [trusted=yes] http://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu ${{matrix.os.release}} main" > deadsnakes.list
7171
false && sudo find ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} -iname apt
7272
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /usr/bin/apt update
@@ -89,35 +89,38 @@ jobs:
8989
- name: Pepare for ${{matrix.os.pypkg}} ${{matrix.os.arch}}
9090
if: matrix.os.matrix == 'linux'
9191
run: |
92-
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /usr/bin/apt install -y ${{matrix.os.pypkg}}-dev gcc clang-7 pkg-config ${{matrix.os.pypkgadd}}
92+
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /usr/bin/apt install -y ${{matrix.os.pypkg}}-dev gcc pkg-config ${{matrix.os.pypkgadd}}
9393
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "wget ${{matrix.os.getpipurl}} -O get-pip.py && ${{matrix.os.pypkg}} get-pip.py || true"
9494
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "${{matrix.os.pypkg}} -m pip install -U 'setuptools<72.0'"
9595
9696
- name: Pepare source and build wheel for ${{matrix.os.pypkg}} ${{matrix.os.arch}}
9797
if: matrix.os.matrix == 'linux'
9898
run: |
9999
sudo mkdir -p ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}}/build_wheel/
100-
sudo tar -xvf dist/zstd-${{matrix.os.version}}.tar.gz -C ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}}/build_wheel/
100+
version=`cat version`
101+
sudo tar -xvf dist/zstd-$version.tar.gz -C ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}}/build_wheel/
101102
false && sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} env
102103
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} pkg-config libzstd --modversion
103-
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} echo CLANG-7
104-
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} clang-7 -v
105-
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "cd /build_wheel/zstd-${{matrix.os.version}} && ZSTD_ASM=1 CC=clang-7 _ZSTD_SMALL=1 ZSTD_WARNINGS=1 _ZSTD_WERRORS=1 _ZSTD_ASM_BMI2=1 ZSTD_THREADS=1 _ZSTD_EXTERNAL=1 ${{matrix.os.pypkg}} setup.py bdist_wheel"
104+
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} echo GCC-7
105+
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} gcc -v
106+
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "cd /build_wheel/zstd-$version && ZSTD_ASM=1 _ZSTD_SMALL=1 ZSTD_WARNINGS=1 _ZSTD_WERRORS=1 _ZSTD_ASM_BMI2=1 ZSTD_THREADS=1 _ZSTD_EXTERNAL=1 ${{matrix.os.pypkg}} setup.py bdist_wheel"
106107
107108
- name: Test wheel for ${{matrix.os.pypkg}} ${{matrix.os.arch}}
108109
if: matrix.os.matrix == 'linux'
109110
run: |
110111
false && sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} find /build_wheel/
111-
sudo cp -v glibc-check.sh ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}}/build_wheel/zstd-${{matrix.os.version}}/
112-
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "cd /build_wheel/zstd-${{matrix.os.version}}/ ls -lh build/*/zstd.*so; ldd build/*/zstd.*so ; file build/*/zstd.*.so; bash ./glibc-check.sh build/*/zstd.*so"
113-
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "cd /build_wheel/zstd-${{matrix.os.version}} && ${{matrix.os.pypkg}} setup.py test"
112+
version=`cat version`
113+
sudo cp -v glibc-check.sh ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}}/build_wheel/zstd-$version/
114+
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "cd /build_wheel/zstd-$version/ && ls -lh build/*/zstd.so; ldd build/*/zstd.so ; file build/*/zstd.so; bash ./glibc-check.sh build/*/zstd.so"
115+
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "cd /build_wheel/zstd-$version && ${{matrix.os.pypkg}} setup.py test"
114116
115117
- name: Pepare wheel for upload
116118
if: matrix.os.matrix == 'linux'
117119
run: |
118-
sudo cp -v ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}}/build_wheel/zstd-${{matrix.os.version}}/dist/* ./dist
120+
version=`cat version`
121+
sudo cp -v ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}}/build_wheel/zstd-$version/dist/* ./dist
119122
sudo ls -lh ./dist/*
120-
sudo mv -v ./dist/"zstd-${{matrix.os.version}}-${{matrix.os.pyengine_tag}}-linux_${{matrix.os.tag_arch}}.whl" ./dist/"zstd-${{matrix.os.version}}-${{matrix.os.pyengine_tag}}-${{matrix.os.libc_tag}}_${{matrix.os.tag_arch}}.whl"
123+
sudo mv -v ./dist/"zstd-$version-${{matrix.os.pyengine_tag}}-linux_${{matrix.os.tag_arch}}.whl" ./dist/"zstd-$version-${{matrix.os.pyengine_tag}}-${{matrix.os.libc_tag}}_${{matrix.os.tag_arch}}.whl"
121124
122125
123126
# - name: Upload artifacts

0 commit comments

Comments
 (0)