From 465f3898830133ddce130ad75cfd7b26b28f68eb Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Mon, 6 Feb 2023 19:53:03 +0530 Subject: [PATCH 01/62] windows build --- .semaphore/semaphore.yml | 76 ++++++++++++++++++++++++--- tools/mingw-w64/msys2-dependencies.sh | 19 +++++++ tools/mingw-w64/semaphore_commands.sh | 11 ++++ tools/mingw-w64/setup-msys2.ps1 | 31 +++++++++++ tools/wheels/build-wheels.bat | 4 -- 5 files changed, 130 insertions(+), 11 deletions(-) create mode 100644 tools/mingw-w64/msys2-dependencies.sh create mode 100644 tools/mingw-w64/semaphore_commands.sh create mode 100644 tools/mingw-w64/setup-msys2.ps1 diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 3a08aeec2..ac39050fc 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -12,8 +12,8 @@ global_job_config: - checkout blocks: - name: "Wheels: OSX x64" - run: - when: "tag =~ '.*'" + # run: + # when: "tag =~ '.*'" dependencies: [] task: agent: @@ -31,8 +31,8 @@ blocks: - tar -czf wheelhouse-macOS-${ARCH}.tgz wheelhouse - artifact push workflow wheelhouse-macOS-${ARCH}.tgz - name: "Wheels: OSX arm64" - run: - when: "tag =~ '.*'" + # run: + # when: "tag =~ '.*'" dependencies: [] task: agent: @@ -51,7 +51,6 @@ blocks: - PIP_INSTALL_OPTIONS="--user" tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" wheelhouse - tar -czf wheelhouse-macOS-${ARCH}.tgz wheelhouse - artifact push workflow wheelhouse-macOS-${ARCH}.tgz - - name: Source package verification with Python 3 (OSX x64) +docs dependencies: [] task: @@ -81,8 +80,8 @@ blocks: - python setup.py build && python setup.py install - make docs - name: "Wheels: Linux arm64" - run: - when: "tag =~ '.*'" + # run: + # when: "tag =~ '.*'" dependencies: [] task: agent: @@ -99,3 +98,66 @@ blocks: - ./tools/build-manylinux.sh "${LIBRDKAFKA_VERSION#v}" - tar -czf wheelhouse-linux-${ARCH}.tgz wheelhouse - artifact push workflow wheelhouse-linux-${ARCH}.tgz + - name: "Wheels: Windows" + # run: + # when: "tag =~ '.*'" + dependencies: [] + task: + agent: + machine: + type: s1-prod-windows + env_vars: + - name: OS_NAME + value: windows + - name: ARCH + value: x64 + prologue: + commands: + - cache restore msys2-x64 + - ".\\tools\\mingw-w64\\setup-msys2.ps1" + - $env:PATH = 'C:\msys64\usr\bin;' + $env:PATH + - bash -lc './tools/mingw-w64/msys2-dependencies.sh' + - cache delete msys2-x64 + - cache store msys2-x64 c:/msys64 + jobs: + - name: Build + env_vars: + - name: CHERE_INVOKING + value: 'yes' + - name: MSYSTEM + value: UCRT64 + commands: + - bash tools/mingw-w64/semaphore_commands.sh + - bash tools/wheels/install-librdkafka.sh $env:LIBRDKAFKA_VERSION.TrimStart("v") dest + - tools/wheels/build-wheels.bat x64 win_amd64 dest wheelhouse + - ls + - tar -czf wheelhouse-windows-${ARCH}.tgz wheelhouse + - artifact push workflow wheelhouse-windows-${ARCH}.tgz + - name: Source package verification with Python 3 (Linux x64) +docs + dependencies: [] + task: + agent: + machine: + type: s1-prod-ubuntu20-04-amd64-3 + env_vars: + - name: OS_NAME + value: linux + - name: ARCH + value: x64 + jobs: + - name: Build + commands: + # use a virtualenv + - python3 -m venv _venv && source _venv/bin/activate + - pip install -r docs/requirements.txt + - pip install -U protobuf + # install librdkafka + - lib_dir=dest/runtimes/$OS_NAME-$ARCH/native + - tools/wheels/install-librdkafka.sh "${LIBRDKAFKA_VERSION#v}" dest + - export CFLAGS="$CFLAGS -I${PWD}/dest/build/native/include" + - export LDFLAGS="$LDFLAGS -L${PWD}/${lib_dir}" + - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/$lib_dir" + - export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$PWD/$lib_dir" + # install confluent-kafka + - python setup.py build && python setup.py install + - make docs diff --git a/tools/mingw-w64/msys2-dependencies.sh b/tools/mingw-w64/msys2-dependencies.sh new file mode 100644 index 000000000..7baedc724 --- /dev/null +++ b/tools/mingw-w64/msys2-dependencies.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +set -e + +export msys2='cmd //C RefreshEnv.cmd ' +export msys2+='& set MSYS=winsymlinks:nativestrict ' +export msys2+='& C:\\msys64\\msys2_shell.cmd -defterm -no-start' +export mingw64="$msys2 -mingw64 -full-path -here -c "\"\$@"\" --" +export msys2+=" -msys2 -c "\"\$@"\" --" + +# Have to update pacman first or choco upgrade will failure due to migration +# to zstd instead of xz compression +$msys2 pacman -Sy --noconfirm pacman + +## Install more MSYS2 packages from https://packages.msys2.org/base here +$msys2 pacman --sync --noconfirm --needed mingw-w64-x86_64-gcc + +## Install unzip +$msys2 pacman --sync --noconfirm --needed unzip diff --git a/tools/mingw-w64/semaphore_commands.sh b/tools/mingw-w64/semaphore_commands.sh new file mode 100644 index 000000000..2fbe5edee --- /dev/null +++ b/tools/mingw-w64/semaphore_commands.sh @@ -0,0 +1,11 @@ +#!/bin/bash +pacman -S python --version 3.8.0 + +set -e + +export PATH="$PATH;C:\Python38;C:\Python38\Scripts" +export MAKE=mingw32-make # so that Autotools can find it + +cmd /c mklink /D C:\Python38\python3.exe C:\Python38\python.exe + +python -m pip install cibuildwheel==2.12.0 diff --git a/tools/mingw-w64/setup-msys2.ps1 b/tools/mingw-w64/setup-msys2.ps1 new file mode 100644 index 000000000..cf7285041 --- /dev/null +++ b/tools/mingw-w64/setup-msys2.ps1 @@ -0,0 +1,31 @@ +# Install (if necessary) and set up msys2. + + +$url="https://github.com/msys2/msys2-installer/releases/download/2022-10-28/msys2-base-x86_64-20221028.sfx.exe" +$sha256="e365b79b4b30b6f4baf34bd93f3d2a41c0a92801c7a96d79cddbfca1090a0554" + + +if (!(Test-Path -Path "c:\msys64\usr\bin\bash.exe")) { + echo "Downloading and installing msys2 to c:\msys64" + + (New-Object System.Net.WebClient).DownloadFile($url, './msys2-installer.exe') + + # Verify checksum + (Get-FileHash -Algorithm "SHA256" .\msys2-installer.exe).hash -eq $sha256 + + # Install msys2 + .\msys2-installer.exe -y -oc:\ + + Remove-Item msys2-installer.exe + + # Set up msys2 the first time + echo "Setting up msys" + c:\msys64\usr\bin\bash -lc ' ' + +} else { + echo "Using previously installed msys2" +} + +# Update packages +echo "Updating msys2 packages" +c:\msys64\usr\bin\bash -lc "pacman --noconfirm -Syuu --overwrite '*'" diff --git a/tools/wheels/build-wheels.bat b/tools/wheels/build-wheels.bat index a925c697e..53ad6e856 100644 --- a/tools/wheels/build-wheels.bat +++ b/tools/wheels/build-wheels.bat @@ -25,12 +25,8 @@ set CIBW_REPAIR_WHEEL_COMMAND=python -m delvewheel repair --add-path %DLL_DIR% - set PATH=%PATH%;c:\Program Files\Git\bin\ -python -m pip install cibuildwheel==2.12.0 || goto :error - python -m cibuildwheel --output-dir %WHEELHOUSE% --platform windows || goto :error -dir %WHEELHOUSE% - goto :eof :usage From debab00f45d8fa75dd8ff2f91407bc5ba30a4269 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Tue, 7 Feb 2023 03:05:29 +0530 Subject: [PATCH 02/62] source package verification for osx and linux --- .semaphore/semaphore.yml | 26 ++------------------------ tools/source-package-verification.sh | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 24 deletions(-) create mode 100644 tools/source-package-verification.sh diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index ac39050fc..8f211cccf 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -67,18 +67,7 @@ blocks: commands: # use a virtualenv - python3 -m venv _venv && source _venv/bin/activate - - pip install -r docs/requirements.txt - - pip install -U protobuf - # install librdkafka - - lib_dir=dest/runtimes/$OS_NAME-$ARCH/native - - tools/wheels/install-librdkafka.sh "${LIBRDKAFKA_VERSION#v}" dest - - export CFLAGS="$CFLAGS -I${PWD}/dest/build/native/include" - - export LDFLAGS="$LDFLAGS -L${PWD}/${lib_dir}" - - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/$lib_dir" - - export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$PWD/$lib_dir" - # install confluent-kafka - - python setup.py build && python setup.py install - - make docs + - tools/source-package-verification.sh - name: "Wheels: Linux arm64" # run: # when: "tag =~ '.*'" @@ -149,15 +138,4 @@ blocks: commands: # use a virtualenv - python3 -m venv _venv && source _venv/bin/activate - - pip install -r docs/requirements.txt - - pip install -U protobuf - # install librdkafka - - lib_dir=dest/runtimes/$OS_NAME-$ARCH/native - - tools/wheels/install-librdkafka.sh "${LIBRDKAFKA_VERSION#v}" dest - - export CFLAGS="$CFLAGS -I${PWD}/dest/build/native/include" - - export LDFLAGS="$LDFLAGS -L${PWD}/${lib_dir}" - - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/$lib_dir" - - export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$PWD/$lib_dir" - # install confluent-kafka - - python setup.py build && python setup.py install - - make docs + - tools/source-package-verification.sh diff --git a/tools/source-package-verification.sh b/tools/source-package-verification.sh new file mode 100644 index 000000000..537fe1c2c --- /dev/null +++ b/tools/source-package-verification.sh @@ -0,0 +1,23 @@ +#!/bin/bash +# +# +# Source Package Verification +# + +pip install -r docs/requirements.txt +pip install -U protobuf +pip install -r tests/requirements.txt + +lib_dir=dest/runtimes/$OS_NAME-$ARCH/native +tools/wheels/install-librdkafka.sh "${LIBRDKAFKA_VERSION#v}" dest +export CFLAGS="$CFLAGS -I${PWD}/dest/build/native/include" +export LDFLAGS="$LDFLAGS -L${PWD}/${lib_dir}" +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/$lib_dir" +export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$PWD/$lib_dir" + +if [[ $OS_NAME == linux ]]; then flake8; fi +# install confluent-kafka +python setup.py build && python setup.py install +python -m pytest --timeout 600 --ignore=dest + # Build docs +if [[ $OS_NAME == linux ]]; then make docs; fi From 29c991c4aaf38da1348139d8410482eb1515a6b3 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Tue, 7 Feb 2023 03:14:41 +0530 Subject: [PATCH 03/62] install options as user --- .semaphore/semaphore.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 8f211cccf..35fb11a0d 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -12,8 +12,8 @@ global_job_config: - checkout blocks: - name: "Wheels: OSX x64" - # run: - # when: "tag =~ '.*'" + run: + when: "tag =~ '.*'" dependencies: [] task: agent: @@ -31,8 +31,8 @@ blocks: - tar -czf wheelhouse-macOS-${ARCH}.tgz wheelhouse - artifact push workflow wheelhouse-macOS-${ARCH}.tgz - name: "Wheels: OSX arm64" - # run: - # when: "tag =~ '.*'" + run: + when: "tag =~ '.*'" dependencies: [] task: agent: @@ -67,10 +67,10 @@ blocks: commands: # use a virtualenv - python3 -m venv _venv && source _venv/bin/activate - - tools/source-package-verification.sh + - PIP_INSTALL_OPTIONS="--user" tools/source-package-verification.sh - name: "Wheels: Linux arm64" - # run: - # when: "tag =~ '.*'" + run: + when: "tag =~ '.*'" dependencies: [] task: agent: @@ -88,8 +88,8 @@ blocks: - tar -czf wheelhouse-linux-${ARCH}.tgz wheelhouse - artifact push workflow wheelhouse-linux-${ARCH}.tgz - name: "Wheels: Windows" - # run: - # when: "tag =~ '.*'" + run: + when: "tag =~ '.*'" dependencies: [] task: agent: @@ -138,4 +138,4 @@ blocks: commands: # use a virtualenv - python3 -m venv _venv && source _venv/bin/activate - - tools/source-package-verification.sh + - PIP_INSTALL_OPTIONS="--user" tools/source-package-verification.sh From da09072138f39e94a8c8dbb6c0f6309c837bfe60 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Tue, 7 Feb 2023 03:18:50 +0530 Subject: [PATCH 04/62] changes --- .semaphore/semaphore.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 35fb11a0d..bfae47544 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -67,6 +67,7 @@ blocks: commands: # use a virtualenv - python3 -m venv _venv && source _venv/bin/activate + - chmod u+r+x tools/source-package-verification.sh - PIP_INSTALL_OPTIONS="--user" tools/source-package-verification.sh - name: "Wheels: Linux arm64" run: @@ -138,4 +139,5 @@ blocks: commands: # use a virtualenv - python3 -m venv _venv && source _venv/bin/activate + - chmod u+r+x tools/source-package-verification.sh - PIP_INSTALL_OPTIONS="--user" tools/source-package-verification.sh From ba08bf2f423bb82bec443347a527f803a64dd100 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Tue, 7 Feb 2023 03:59:14 +0530 Subject: [PATCH 05/62] changes --- .semaphore/semaphore.yml | 2 ++ tools/source-package-verification.sh | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index bfae47544..de808fb1a 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -69,6 +69,7 @@ blocks: - python3 -m venv _venv && source _venv/bin/activate - chmod u+r+x tools/source-package-verification.sh - PIP_INSTALL_OPTIONS="--user" tools/source-package-verification.sh + - python -m pytest --timeout 600 --ignore=dest - name: "Wheels: Linux arm64" run: when: "tag =~ '.*'" @@ -141,3 +142,4 @@ blocks: - python3 -m venv _venv && source _venv/bin/activate - chmod u+r+x tools/source-package-verification.sh - PIP_INSTALL_OPTIONS="--user" tools/source-package-verification.sh + - python -m pytest --timeout 600 --ignore=dest diff --git a/tools/source-package-verification.sh b/tools/source-package-verification.sh index 537fe1c2c..e1850c8da 100644 --- a/tools/source-package-verification.sh +++ b/tools/source-package-verification.sh @@ -18,6 +18,5 @@ export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$PWD/$lib_dir" if [[ $OS_NAME == linux ]]; then flake8; fi # install confluent-kafka python setup.py build && python setup.py install -python -m pytest --timeout 600 --ignore=dest # Build docs if [[ $OS_NAME == linux ]]; then make docs; fi From 92b4d72682161397196a1b391611f41fce41b3ea Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Tue, 7 Feb 2023 05:01:55 +0530 Subject: [PATCH 06/62] changes --- .semaphore/semaphore.yml | 6 ++---- tools/source-package-verification.sh | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index de808fb1a..4880ff74b 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -68,8 +68,7 @@ blocks: # use a virtualenv - python3 -m venv _venv && source _venv/bin/activate - chmod u+r+x tools/source-package-verification.sh - - PIP_INSTALL_OPTIONS="--user" tools/source-package-verification.sh - - python -m pytest --timeout 600 --ignore=dest + - tools/source-package-verification.sh - name: "Wheels: Linux arm64" run: when: "tag =~ '.*'" @@ -141,5 +140,4 @@ blocks: # use a virtualenv - python3 -m venv _venv && source _venv/bin/activate - chmod u+r+x tools/source-package-verification.sh - - PIP_INSTALL_OPTIONS="--user" tools/source-package-verification.sh - - python -m pytest --timeout 600 --ignore=dest + - tools/source-package-verification.sh diff --git a/tools/source-package-verification.sh b/tools/source-package-verification.sh index e1850c8da..bce0cf124 100644 --- a/tools/source-package-verification.sh +++ b/tools/source-package-verification.sh @@ -6,7 +6,6 @@ pip install -r docs/requirements.txt pip install -U protobuf -pip install -r tests/requirements.txt lib_dir=dest/runtimes/$OS_NAME-$ARCH/native tools/wheels/install-librdkafka.sh "${LIBRDKAFKA_VERSION#v}" dest @@ -17,6 +16,7 @@ export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$PWD/$lib_dir" if [[ $OS_NAME == linux ]]; then flake8; fi # install confluent-kafka -python setup.py build && python setup.py install # Build docs if [[ $OS_NAME == linux ]]; then make docs; fi +python setup.py build && python setup.py install +python -m pytest --timeout 600 --ignore=dest From f808bd6e203085abd874c9f388258df1317e8bdd Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Tue, 7 Feb 2023 05:09:11 +0530 Subject: [PATCH 07/62] changes --- tools/source-package-verification.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/source-package-verification.sh b/tools/source-package-verification.sh index bce0cf124..009a80615 100644 --- a/tools/source-package-verification.sh +++ b/tools/source-package-verification.sh @@ -6,6 +6,7 @@ pip install -r docs/requirements.txt pip install -U protobuf +pip install -r tests/requirements.txt lib_dir=dest/runtimes/$OS_NAME-$ARCH/native tools/wheels/install-librdkafka.sh "${LIBRDKAFKA_VERSION#v}" dest From f6af31bf886744accbb928d4e52522592e1cf055 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Tue, 7 Feb 2023 05:48:49 +0530 Subject: [PATCH 08/62] changes --- .semaphore/semaphore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 4880ff74b..a8710ae03 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -67,7 +67,7 @@ blocks: commands: # use a virtualenv - python3 -m venv _venv && source _venv/bin/activate - - chmod u+r+x tools/source-package-verification.sh + - chmod u+r+x - tools/source-package-verification.sh - name: "Wheels: Linux arm64" run: From b1abcb1716887e2c0bad7eb90408fa49f0defe12 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Tue, 7 Feb 2023 05:53:47 +0530 Subject: [PATCH 09/62] changes --- .semaphore/semaphore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index a8710ae03..4880ff74b 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -67,7 +67,7 @@ blocks: commands: # use a virtualenv - python3 -m venv _venv && source _venv/bin/activate - - chmod u+r+x + - chmod u+r+x tools/source-package-verification.sh - tools/source-package-verification.sh - name: "Wheels: Linux arm64" run: From ea343ef59c540cee058c4250f071beab5d5084af Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Tue, 7 Feb 2023 14:49:55 +0530 Subject: [PATCH 10/62] python version 3.10 to 3.8 --- .semaphore/semaphore.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 4880ff74b..8a87e70c2 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -65,6 +65,7 @@ blocks: jobs: - name: Build commands: + - sem-version python 3.8 # use a virtualenv - python3 -m venv _venv && source _venv/bin/activate - chmod u+r+x tools/source-package-verification.sh @@ -137,6 +138,7 @@ blocks: jobs: - name: Build commands: + - sem-version python 3.8 # use a virtualenv - python3 -m venv _venv && source _venv/bin/activate - chmod u+r+x tools/source-package-verification.sh From 81fc78dc336b7f6c92c9252168e1941f16fddfcc Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Tue, 7 Feb 2023 15:20:11 +0530 Subject: [PATCH 11/62] changes --- tools/source-package-verification.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/source-package-verification.sh b/tools/source-package-verification.sh index 009a80615..3cdca4828 100644 --- a/tools/source-package-verification.sh +++ b/tools/source-package-verification.sh @@ -15,6 +15,9 @@ export LDFLAGS="$LDFLAGS -L${PWD}/${lib_dir}" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/$lib_dir" export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$PWD/$lib_dir" +echo LD_LIBRARY_PATH + + if [[ $OS_NAME == linux ]]; then flake8; fi # install confluent-kafka # Build docs From 28e359233690ad3ed75b9519865222e6ed6a1e8e Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Tue, 7 Feb 2023 15:45:55 +0530 Subject: [PATCH 12/62] changes --- .semaphore/semaphore.yml | 13 +++++++++++-- tools/source-package-verification.sh | 3 --- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 8a87e70c2..8ee6376f0 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -68,8 +68,17 @@ blocks: - sem-version python 3.8 # use a virtualenv - python3 -m venv _venv && source _venv/bin/activate - - chmod u+r+x tools/source-package-verification.sh - - tools/source-package-verification.sh + - pip install -r docs/requirements.txt + - pip install -U protobuf + - pip install -r tests/requirements.txt + - lib_dir=dest/runtimes/$OS_NAME-$ARCH/native + - tools/wheels/install-librdkafka.sh "${LIBRDKAFKA_VERSION#v}" dest + - export CFLAGS="$CFLAGS -I${PWD}/dest/build/native/include" + - export LDFLAGS="$LDFLAGS -L${PWD}/${lib_dir}" + - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/$lib_dir" + - export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$PWD/$lib_dir" + - python setup.py build && python setup.py install + - python -m pytest --timeout 600 --ignore=dest - name: "Wheels: Linux arm64" run: when: "tag =~ '.*'" diff --git a/tools/source-package-verification.sh b/tools/source-package-verification.sh index 3cdca4828..009a80615 100644 --- a/tools/source-package-verification.sh +++ b/tools/source-package-verification.sh @@ -15,9 +15,6 @@ export LDFLAGS="$LDFLAGS -L${PWD}/${lib_dir}" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/$lib_dir" export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$PWD/$lib_dir" -echo LD_LIBRARY_PATH - - if [[ $OS_NAME == linux ]]; then flake8; fi # install confluent-kafka # Build docs From 226888f81858dd57fd128b1cadaf7313c5e8975d Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Tue, 7 Feb 2023 18:24:10 +0530 Subject: [PATCH 13/62] changes --- .semaphore/semaphore.yml | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 8ee6376f0..d143b3283 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -51,12 +51,12 @@ blocks: - PIP_INSTALL_OPTIONS="--user" tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" wheelhouse - tar -czf wheelhouse-macOS-${ARCH}.tgz wheelhouse - artifact push workflow wheelhouse-macOS-${ARCH}.tgz - - name: Source package verification with Python 3 (OSX x64) +docs + - name: Source package verification with Python 3 (OSX arm64) +docs dependencies: [] task: agent: machine: - type: s1-prod-macos + type: s1-prod-macos-arm64 env_vars: - name: OS_NAME value: osx @@ -68,17 +68,27 @@ blocks: - sem-version python 3.8 # use a virtualenv - python3 -m venv _venv && source _venv/bin/activate - - pip install -r docs/requirements.txt - - pip install -U protobuf - - pip install -r tests/requirements.txt - - lib_dir=dest/runtimes/$OS_NAME-$ARCH/native - - tools/wheels/install-librdkafka.sh "${LIBRDKAFKA_VERSION#v}" dest - - export CFLAGS="$CFLAGS -I${PWD}/dest/build/native/include" - - export LDFLAGS="$LDFLAGS -L${PWD}/${lib_dir}" - - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/$lib_dir" - - export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$PWD/$lib_dir" - - python setup.py build && python setup.py install - - python -m pytest --timeout 600 --ignore=dest + - chmod u+r+x tools/source-package-verification.sh + - tools/source-package-verification.sh + - name: Source package verification with Python 3 (OSX x64) +docs + dependencies: [] + task: + agent: + machine: + type: s1-prod-macos-arm64 + env_vars: + - name: OS_NAME + value: osx + - name: ARCH + value: x64 + jobs: + - name: Build + commands: + - sem-version python 3.8 + # use a virtualenv + - python3 -m venv _venv && source _venv/bin/activate + - chmod u+r+x tools/source-package-verification.sh + - tools/source-package-verification.sh - name: "Wheels: Linux arm64" run: when: "tag =~ '.*'" From 9bac738deacacfeea6d9416f37928cf168979d66 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Tue, 7 Feb 2023 18:29:13 +0530 Subject: [PATCH 14/62] changes --- .semaphore/semaphore.yml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index d143b3283..35111bd00 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -70,25 +70,25 @@ blocks: - python3 -m venv _venv && source _venv/bin/activate - chmod u+r+x tools/source-package-verification.sh - tools/source-package-verification.sh - - name: Source package verification with Python 3 (OSX x64) +docs - dependencies: [] - task: - agent: - machine: - type: s1-prod-macos-arm64 - env_vars: - - name: OS_NAME - value: osx - - name: ARCH - value: x64 - jobs: - - name: Build - commands: - - sem-version python 3.8 - # use a virtualenv - - python3 -m venv _venv && source _venv/bin/activate - - chmod u+r+x tools/source-package-verification.sh - - tools/source-package-verification.sh + - name: Source package verification with Python 3 (OSX x64) +docs + dependencies: [] + task: + agent: + machine: + type: s1-prod-macos-arm64 + env_vars: + - name: OS_NAME + value: osx + - name: ARCH + value: x64 + jobs: + - name: Build + commands: + - sem-version python 3.8 + # use a virtualenv + - python3 -m venv _venv && source _venv/bin/activate + - chmod u+r+x tools/source-package-verification.sh + - tools/source-package-verification.sh - name: "Wheels: Linux arm64" run: when: "tag =~ '.*'" From 041b8d11a0152b68213cd50303927e48cb8b5356 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Tue, 7 Feb 2023 18:31:26 +0530 Subject: [PATCH 15/62] changes --- .semaphore/semaphore.yml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 35111bd00..7cf02b167 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -71,24 +71,24 @@ blocks: - chmod u+r+x tools/source-package-verification.sh - tools/source-package-verification.sh - name: Source package verification with Python 3 (OSX x64) +docs - dependencies: [] - task: - agent: - machine: - type: s1-prod-macos-arm64 - env_vars: - - name: OS_NAME - value: osx - - name: ARCH - value: x64 - jobs: - - name: Build - commands: - - sem-version python 3.8 - # use a virtualenv - - python3 -m venv _venv && source _venv/bin/activate - - chmod u+r+x tools/source-package-verification.sh - - tools/source-package-verification.sh + dependencies: [] + task: + agent: + machine: + type: s1-prod-macos-arm64 + env_vars: + - name: OS_NAME + value: osx + - name: ARCH + value: x64 + jobs: + - name: Build + commands: + - sem-version python 3.8 + # use a virtualenv + - python3 -m venv _venv && source _venv/bin/activate + - chmod u+r+x tools/source-package-verification.sh + - tools/source-package-verification.sh - name: "Wheels: Linux arm64" run: when: "tag =~ '.*'" From df1a038f20d59185b0918b2e91bbb61fb9648ec8 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Tue, 7 Feb 2023 18:36:36 +0530 Subject: [PATCH 16/62] changes --- .semaphore/semaphore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 7cf02b167..9b5101653 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -75,7 +75,7 @@ blocks: task: agent: machine: - type: s1-prod-macos-arm64 + type: s1-prod-macos env_vars: - name: OS_NAME value: osx From 5b8c325673726402dc3630465b57feffa183d587 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Tue, 7 Feb 2023 20:34:04 +0530 Subject: [PATCH 17/62] integrations on linux only --- tools/source-package-verification.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/source-package-verification.sh b/tools/source-package-verification.sh index 009a80615..84efd93e9 100644 --- a/tools/source-package-verification.sh +++ b/tools/source-package-verification.sh @@ -20,4 +20,8 @@ if [[ $OS_NAME == linux ]]; then flake8; fi # Build docs if [[ $OS_NAME == linux ]]; then make docs; fi python setup.py build && python setup.py install -python -m pytest --timeout 600 --ignore=dest +if [[ $OS_NAME == linux ]]; then + python -m pytest --timeout 600 --ignore=dest +else + python -m pytest --timeout 600 --ignore=dest --ignore=tests/integration +fi From 30c5476f40f009a17f49733aaa1fd18a175309d4 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Tue, 7 Feb 2023 21:43:56 +0530 Subject: [PATCH 18/62] source verification on windows --- .semaphore/semaphore.yml | 47 +++++++++++++++++++++++++++- tools/source-package-verification.sh | 8 ++--- 2 files changed, 49 insertions(+), 6 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 9b5101653..74d3c7159 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -143,7 +143,7 @@ blocks: - ls - tar -czf wheelhouse-windows-${ARCH}.tgz wheelhouse - artifact push workflow wheelhouse-windows-${ARCH}.tgz - - name: Source package verification with Python 3 (Linux x64) +docs + - name: Source package verification with Python 3 (Linux x64) dependencies: [] task: agent: @@ -162,3 +162,48 @@ blocks: - python3 -m venv _venv && source _venv/bin/activate - chmod u+r+x tools/source-package-verification.sh - tools/source-package-verification.sh + - name: Source package verification with Python 3 (Linux arm64) + dependencies: [] + task: + agent: + machine: + type: s1-prod-ubuntu20-04-amd64-3 + env_vars: + - name: OS_NAME + value: linux + - name: ARCH + value: arm64 + jobs: + - name: Build + commands: + - sem-version python 3.8 + # use a virtualenv + - python3 -m venv _venv && source _venv/bin/activate + - chmod u+r+x tools/source-package-verification.sh + - tools/source-package-verification.sh + - name: Source package verification with Python 3 (Windows) + dependencies: [] + task: + agent: + machine: + type: s1-prod-ubuntu20-04-amd64-3 + env_vars: + - name: OS_NAME + value: windows + - name: ARCH + value: x64 + prologue: + commands: + - cache restore msys2-x64 + - ".\\tools\\mingw-w64\\setup-msys2.ps1" + - $env:PATH = 'C:\msys64\usr\bin;' + $env:PATH + - bash -lc './tools/mingw-w64/msys2-dependencies.sh' + - cache delete msys2-x64 + - cache store msys2-x64 c:/msys64 + jobs: + - name: Build + commands: + - sem-version python 3.8 + # use a virtualenv + - python3 -m venv _venv && source _venv/bin/activate + - bash tools/source-package-verification.sh diff --git a/tools/source-package-verification.sh b/tools/source-package-verification.sh index 84efd93e9..937f19b79 100644 --- a/tools/source-package-verification.sh +++ b/tools/source-package-verification.sh @@ -15,12 +15,10 @@ export LDFLAGS="$LDFLAGS -L${PWD}/${lib_dir}" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/$lib_dir" export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$PWD/$lib_dir" -if [[ $OS_NAME == linux ]]; then flake8; fi -# install confluent-kafka - # Build docs -if [[ $OS_NAME == linux ]]; then make docs; fi python setup.py build && python setup.py install -if [[ $OS_NAME == linux ]]; then +if [[ $OS_NAME == linux ]]; then + flake8 + make docs python -m pytest --timeout 600 --ignore=dest else python -m pytest --timeout 600 --ignore=dest --ignore=tests/integration From 80b14960b63d55c402d1603fbc401d9b74247e62 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Tue, 7 Feb 2023 21:45:38 +0530 Subject: [PATCH 19/62] changes --- .semaphore/semaphore.yml | 4 ++-- tools/source-package-verification.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 74d3c7159..6a0755af1 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -148,7 +148,7 @@ blocks: task: agent: machine: - type: s1-prod-ubuntu20-04-amd64-3 + type: s1-prod-ubuntu20-04-amd64-2 env_vars: - name: OS_NAME value: linux @@ -167,7 +167,7 @@ blocks: task: agent: machine: - type: s1-prod-ubuntu20-04-amd64-3 + type: s1-prod-ubuntu20-04-arm64-1 env_vars: - name: OS_NAME value: linux diff --git a/tools/source-package-verification.sh b/tools/source-package-verification.sh index 937f19b79..2d2503985 100644 --- a/tools/source-package-verification.sh +++ b/tools/source-package-verification.sh @@ -16,7 +16,7 @@ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/$lib_dir" export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$PWD/$lib_dir" python setup.py build && python setup.py install -if [[ $OS_NAME == linux ]]; then +if [[ $OS_NAME == linux && $ARCH == amd64 ]]; then flake8 make docs python -m pytest --timeout 600 --ignore=dest From eca1e4b5e771ed86e7d48dbce94bf0d4b74fd686 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Tue, 7 Feb 2023 21:50:58 +0530 Subject: [PATCH 20/62] changes --- .semaphore/semaphore.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 6a0755af1..63b23d4ca 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -186,7 +186,7 @@ blocks: task: agent: machine: - type: s1-prod-ubuntu20-04-amd64-3 + type: s1-prod-windows env_vars: - name: OS_NAME value: windows @@ -202,6 +202,11 @@ blocks: - cache store msys2-x64 c:/msys64 jobs: - name: Build + env_vars: + - name: CHERE_INVOKING + value: 'yes' + - name: MSYSTEM + value: UCRT64 commands: - sem-version python 3.8 # use a virtualenv From 215993c4f6b5b10249fa3110aec219e6b06cc5ed Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Tue, 7 Feb 2023 22:09:16 +0530 Subject: [PATCH 21/62] changes --- .semaphore/semaphore.yml | 7 +++++-- tools/mingw-w64/semaphore_commands.sh | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 63b23d4ca..3d910a5cf 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -136,11 +136,12 @@ blocks: value: 'yes' - name: MSYSTEM value: UCRT64 + - name: BUILD_WHEELS + value: 1 commands: - bash tools/mingw-w64/semaphore_commands.sh - bash tools/wheels/install-librdkafka.sh $env:LIBRDKAFKA_VERSION.TrimStart("v") dest - tools/wheels/build-wheels.bat x64 win_amd64 dest wheelhouse - - ls - tar -czf wheelhouse-windows-${ARCH}.tgz wheelhouse - artifact push workflow wheelhouse-windows-${ARCH}.tgz - name: Source package verification with Python 3 (Linux x64) @@ -192,6 +193,8 @@ blocks: value: windows - name: ARCH value: x64 + - name: BUILD_WHEELS + value: 0 prologue: commands: - cache restore msys2-x64 @@ -208,7 +211,7 @@ blocks: - name: MSYSTEM value: UCRT64 commands: - - sem-version python 3.8 + - bash tools/mingw-w64/semaphore_commands.sh # use a virtualenv - python3 -m venv _venv && source _venv/bin/activate - bash tools/source-package-verification.sh diff --git a/tools/mingw-w64/semaphore_commands.sh b/tools/mingw-w64/semaphore_commands.sh index 2fbe5edee..59eddb8a5 100644 --- a/tools/mingw-w64/semaphore_commands.sh +++ b/tools/mingw-w64/semaphore_commands.sh @@ -8,4 +8,4 @@ export MAKE=mingw32-make # so that Autotools can find it cmd /c mklink /D C:\Python38\python3.exe C:\Python38\python.exe -python -m pip install cibuildwheel==2.12.0 +if [[ $BUILD_WHEELS != 1 ]]; then python -m pip install cibuildwheel==2.12.0;fi From e3077c0166a389c5b7f6bb74f6852d8144d29976 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Tue, 7 Feb 2023 22:18:06 +0530 Subject: [PATCH 22/62] changes --- .semaphore/semaphore.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 3d910a5cf..ef3ed7408 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -137,7 +137,7 @@ blocks: - name: MSYSTEM value: UCRT64 - name: BUILD_WHEELS - value: 1 + value: '1' commands: - bash tools/mingw-w64/semaphore_commands.sh - bash tools/wheels/install-librdkafka.sh $env:LIBRDKAFKA_VERSION.TrimStart("v") dest @@ -194,7 +194,7 @@ blocks: - name: ARCH value: x64 - name: BUILD_WHEELS - value: 0 + value: '0' prologue: commands: - cache restore msys2-x64 From 1156043ed0272d9bfd9278e698c5e36eeeef796c Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Tue, 7 Feb 2023 22:19:14 +0530 Subject: [PATCH 23/62] changes --- tools/mingw-w64/semaphore_commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/mingw-w64/semaphore_commands.sh b/tools/mingw-w64/semaphore_commands.sh index 59eddb8a5..afd82da94 100644 --- a/tools/mingw-w64/semaphore_commands.sh +++ b/tools/mingw-w64/semaphore_commands.sh @@ -8,4 +8,4 @@ export MAKE=mingw32-make # so that Autotools can find it cmd /c mklink /D C:\Python38\python3.exe C:\Python38\python.exe -if [[ $BUILD_WHEELS != 1 ]]; then python -m pip install cibuildwheel==2.12.0;fi +if [[ $BUILD_WHEELS == '1' ]]; then python -m pip install cibuildwheel==2.12.0;fi From 2d09d81592059205ba5d5937d96e155e840aa0ff Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Tue, 7 Feb 2023 22:59:25 +0530 Subject: [PATCH 24/62] changes --- .semaphore/semaphore.yml | 2 +- .travis.yml | 92 ---------------------------------------- 2 files changed, 1 insertion(+), 93 deletions(-) delete mode 100644 .travis.yml diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index ef3ed7408..2f47358b3 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -213,5 +213,5 @@ blocks: commands: - bash tools/mingw-w64/semaphore_commands.sh # use a virtualenv - - python3 -m venv _venv && source _venv/bin/activate + - python3 -m venv _venv -and source _venv/bin/activate - bash tools/source-package-verification.sh diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index f75e0879b..000000000 --- a/.travis.yml +++ /dev/null @@ -1,92 +0,0 @@ -env: - global: - - LIBRDKAFKA_VERSION=v2.0.2 - - LIBRDKAFKA_SRC_VERSION=v2.0.2 - -jobs: - include: - - name: "Source package verification with Python 3.8 (Linux)" - os: linux - language: python - dist: xenial - python: "3.8" - env: LD_LIBRARY_PATH="$PWD/tmp-build/lib" - services: docker - - - name: "Wheels: Windows x64" - if: tag is present - os: windows - language: shell - env: BUILD_WHEELS=1 - before_install: - - choco install python --version 3.8.0 - - export PATH="/c/Python38:/c/Python38/Scripts:$PATH" - # make sure it's on PATH as 'python3' - - ln -s /c/Python38/python.exe /c/Python38/python3.exe - install: - - bash tools/wheels/install-librdkafka.sh ${LIBRDKAFKA_VERSION#v} dest - script: - - tools/wheels/build-wheels.bat x64 win_amd64 dest wheelhouse - - - name: "Wheels: Windows x86" - if: tag is present - os: windows - language: shell - env: BUILD_WHEELS=1 - before_install: - - choco install python --version 3.8.0 - - export PATH="/c/Python38:/c/Python38/Scripts:$PATH" - # make sure it's on PATH as 'python3' - - ln -s /c/Python38/python.exe /c/Python38/python3.exe - install: - - bash tools/wheels/install-librdkafka.sh ${LIBRDKAFKA_VERSION#v} dest - script: - - tools/wheels/build-wheels.bat x86 win32 dest wheelhouse - - - name: "Wheels: Linux x64" - if: tag is present - language: python - python: "3.8" - services: docker - env: BUILD_WHEELS=1 - script: tools/wheels/build-wheels.sh ${LIBRDKAFKA_VERSION#v} wheelhouse - -install: - # Install interceptors - - tools/install-interceptors.sh - - if [[ $BUILD_WHEELS != 1 ]]; then pip install -r tests/requirements.txt ; fi - - if [[ $MK_DOCS == y ]]; then pip install -r docs/requirements.txt; fi - # Install librdkafka and confluent_kafka[avro] if not building wheels - - if [[ $BUILD_WHEELS != 1 ]]; then pip install -U protobuf && tools/bootstrap-librdkafka.sh --require-ssl ${LIBRDKAFKA_SRC_VERSION} tmp-build ; fi - - - -# Note: Will not be run for wheel builds. -script: - - flake8 - # Build package - - pip install --global-option=build_ext --global-option="-Itmp-build/include/" --global-option="-Ltmp-build/lib" . .[avro] .[schema-registry] .[json] .[protobuf] - - ldd staging/libs/* || otool -L staging/libs/* || true - # Run tests - - if [[ $TRAVIS_OS_NAME == "linux" ]]; then LD_LIBRARY_PATH=$LD_LIBRARY_PATH:staging/libs DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:staging/libs python -m pytest --timeout 600 --ignore=tmp-build || travis_terminate 1; fi - # Build docs - - if [[ $MK_DOCS == y ]]; then make docs; fi - # Checksum artifacts to build log - - sha256sum wheelhouse/* || true - -deploy: - provider: s3 - edge: true - access_key_id: - secure: "HGz8fJ0DLM0T7BddjuSBpPw+mRAmp1vP1xbl+gfhPsPTmXfjeAczj1YekfH6yrro7I3JwwNfXtUIofgRSeVW3Hl6rCI+ODnF82TFdjo/7yA3owUaVc4rx1qau6oMBCYWFCoHrQo+qHJ+bMpG1ppZvRR+pgaY+YBCTkki4p3q0MKYppnZmC89pvJkOBZatNUxzhZLcyMykShN+cdp3z7o2oED9/IJ8m30g0mkt/jIUZFdTiK/mQ2NxcZn667AAsSnyOud1pdXeg+UMvjR6U2thESw7DJpKyWJqv2eU/8SWGQyzvom+W44ZWdgjtqHo1ObTcKR2PHB3yYx6kixo5Wp9PUP/c0jAj78k+BURs/XXKj5fk/mM9FDlJpFv4FUDbhl1tTLdKNEltRYfjPfNApb963QEx0VyXWSxnBEVdOoi3SSdlx80EnYxPX3OfMKvIeYFTIURow7E1YMHl4kvBuYxRAUPjiuNn43jfqkgRhkdY7YaofJvu2hDw/togD1uUemP49QoCP9aC0TJ3aF/qfpcpoc8g8K6sF0cu5uOGyU2LGtYK0uYVZzkMKTX6QBP8I8SJU0Zw2Xprtwl7/qtZri47N83f5/WrWMNIVLOKdbLxPC2piT6N3M3aBt5l07dkEDmnzen585mQrNNbuXg/Din3D1XpGPWUxAZjw/LfcOR+A=" - secret_access_key: - secure: "YBAWciQ0WIhFJw/V72iERmukozz1hxd3HVbrhedHiNotYa53kQMd9qz9p6c4aJUF/y6xPrctCRVK1fUYlKVFJzCyPp5TOdqHcv56q9X9ip4Mt+oVwzbtdeHxGX+AYkr6sSn6xNlE6uNFaTVPzQ1EAL9WfhVkcuYDdponr8yc/HnCOIjafa7LZmtefnEpwhU1sAlyJFVeJkQfagZlmrz7cMiDpsvI10GXydJGWmwLoUTEKQiUf1ZKSlVd92bAWmALyCXmUZ0aS7SisO54580AsOR1TdWNIKZJ21n7PYY08GtoJtb9593CLgK0Z3FtTo2GZQbd2jehWA7ag8ku4e8rYNb78dSalKcN86kFH7GR6UJL+pL1c8O4LIJMzKALFcqpHYlxmyhPIzCCfVlCIWxwk/qTloa7dNBODb0vqAJJEbZ3q950Ig93gyU1kxiE8dwHkrQzlJCyufNtPY51Kv8MGa7n+/tI9z4LK4VVz+w4CrCzzl8T7SpWV4w+BKMKkymR4hL4JrpLnB8egpRqIL/V3E61qA1x9ik5Ck2AP+wEshiou3oJZ7BU0cGmp0ttVidwZ96sp2wxStulouQDwuT1A6jkvcCt5s3pM3eYIrucYk/mtBwHoz8DyYZH1Ds1JmTffCe4ZeEfFzIC5RIzpbj90t03aTd4oYVgYETPPyfdqhU=" - bucket: librdkafka-ci-packages - region: us-west-1 - local-dir: wheelhouse - upload_dir: confluent-kafka-python/p-confluent-kafka-python__bld-travis__plat-${TRAVIS_OS_NAME}__tag-${TRAVIS_TAG}__sha-${TRAVIS_COMMIT}__bid-${TRAVIS_BUILD_ID}__ - cleanup: false - on: - repo: confluentinc/confluent-kafka-python - tags: true - condition: "$BUILD_WHEELS == 1" From e079d40fc7984c8968864f07009d907550ab12b0 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Tue, 7 Feb 2023 23:02:06 +0530 Subject: [PATCH 25/62] changes --- .semaphore/semaphore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 2f47358b3..c2d85c446 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -213,5 +213,5 @@ blocks: commands: - bash tools/mingw-w64/semaphore_commands.sh # use a virtualenv - - python3 -m venv _venv -and source _venv/bin/activate + - python3 -m venv _venv -and _venv\Scripts\activate - bash tools/source-package-verification.sh From 4cb143816fa295d1071725e11597a01f93508f5c Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Tue, 7 Feb 2023 23:33:58 +0530 Subject: [PATCH 26/62] changes --- .semaphore/semaphore.yml | 3 ++- tools/source-package-verification.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index c2d85c446..55beec45a 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -213,5 +213,6 @@ blocks: commands: - bash tools/mingw-w64/semaphore_commands.sh # use a virtualenv - - python3 -m venv _venv -and _venv\Scripts\activate + - python3 -m venv t_venv + - t_venv\Scripts\activate - bash tools/source-package-verification.sh diff --git a/tools/source-package-verification.sh b/tools/source-package-verification.sh index 2d2503985..570f4e8d5 100644 --- a/tools/source-package-verification.sh +++ b/tools/source-package-verification.sh @@ -16,7 +16,7 @@ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/$lib_dir" export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$PWD/$lib_dir" python setup.py build && python setup.py install -if [[ $OS_NAME == linux && $ARCH == amd64 ]]; then +if [[ $OS_NAME == linux && $ARCH == x64 ]]; then flake8 make docs python -m pytest --timeout 600 --ignore=dest From b73759b5cf2c98210f7d54d2a96bc5aa9a05b9cf Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Wed, 8 Feb 2023 03:08:27 +0530 Subject: [PATCH 27/62] changes --- .semaphore/semaphore.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 55beec45a..948b41e25 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -109,8 +109,8 @@ blocks: - tar -czf wheelhouse-linux-${ARCH}.tgz wheelhouse - artifact push workflow wheelhouse-linux-${ARCH}.tgz - name: "Wheels: Windows" - run: - when: "tag =~ '.*'" + # run: + # when: "tag =~ '.*'" dependencies: [] task: agent: @@ -140,7 +140,6 @@ blocks: value: '1' commands: - bash tools/mingw-w64/semaphore_commands.sh - - bash tools/wheels/install-librdkafka.sh $env:LIBRDKAFKA_VERSION.TrimStart("v") dest - tools/wheels/build-wheels.bat x64 win_amd64 dest wheelhouse - tar -czf wheelhouse-windows-${ARCH}.tgz wheelhouse - artifact push workflow wheelhouse-windows-${ARCH}.tgz @@ -215,4 +214,13 @@ blocks: # use a virtualenv - python3 -m venv t_venv - t_venv\Scripts\activate - - bash tools/source-package-verification.sh + - nuget install librdkafka.redist -version $env:LIBRDKAFKA_VERSION.TrimStart("v") -OutputDirectory dest + - curl -s https://raw.githubusercontent.com/chemeris/msinttypes/master/inttypes.h -o inttypes.h + - curl -s https://raw.githubusercontent.com/chemeris/msinttypes/master/stdint.h -o stdint.h + - call tools\windows-copy-librdkafka.bat $env:LIBRDKAFKA_VERSION.TrimStart("v") C:\Python38 + - set include=%cd%\dest\build\native\include + - set lib=%cd%\dest\build\native\lib\win\%ARCH%\win-%ARCH%-Release\v142 + - set DLL_DIR=%cd%\dest\runtimes\win-%ARCH%\native + - python setup.py build && python setup.py install + - python -m pytest --timeout 600 --ignore=dest --ignore=tests/integration + From d80e49d8dd765cef5e46f575c1652c10b4ca718e Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Wed, 8 Feb 2023 04:08:27 +0530 Subject: [PATCH 28/62] changes --- .semaphore/semaphore.yml | 15 +++------------ tools/source-package-verification.sh | 16 +++++++++++----- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 948b41e25..4b0c24ac5 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -140,6 +140,7 @@ blocks: value: '1' commands: - bash tools/mingw-w64/semaphore_commands.sh + - bash tools/wheels/install-librdkafka.sh $env:LIBRDKAFKA_VERSION.TrimStart("v") dest - tools/wheels/build-wheels.bat x64 win_amd64 dest wheelhouse - tar -czf wheelhouse-windows-${ARCH}.tgz wheelhouse - artifact push workflow wheelhouse-windows-${ARCH}.tgz @@ -212,15 +213,5 @@ blocks: commands: - bash tools/mingw-w64/semaphore_commands.sh # use a virtualenv - - python3 -m venv t_venv - - t_venv\Scripts\activate - - nuget install librdkafka.redist -version $env:LIBRDKAFKA_VERSION.TrimStart("v") -OutputDirectory dest - - curl -s https://raw.githubusercontent.com/chemeris/msinttypes/master/inttypes.h -o inttypes.h - - curl -s https://raw.githubusercontent.com/chemeris/msinttypes/master/stdint.h -o stdint.h - - call tools\windows-copy-librdkafka.bat $env:LIBRDKAFKA_VERSION.TrimStart("v") C:\Python38 - - set include=%cd%\dest\build\native\include - - set lib=%cd%\dest\build\native\lib\win\%ARCH%\win-%ARCH%-Release\v142 - - set DLL_DIR=%cd%\dest\runtimes\win-%ARCH%\native - - python setup.py build && python setup.py install - - python -m pytest --timeout 600 --ignore=dest --ignore=tests/integration - + - python3 -m venv _venv && source _venv/bin/activate + - bash tools/source-package-verification.sh diff --git a/tools/source-package-verification.sh b/tools/source-package-verification.sh index 570f4e8d5..72f9aec8f 100644 --- a/tools/source-package-verification.sh +++ b/tools/source-package-verification.sh @@ -8,12 +8,18 @@ pip install -r docs/requirements.txt pip install -U protobuf pip install -r tests/requirements.txt -lib_dir=dest/runtimes/$OS_NAME-$ARCH/native tools/wheels/install-librdkafka.sh "${LIBRDKAFKA_VERSION#v}" dest -export CFLAGS="$CFLAGS -I${PWD}/dest/build/native/include" -export LDFLAGS="$LDFLAGS -L${PWD}/${lib_dir}" -export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/$lib_dir" -export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$PWD/$lib_dir" +if [[ $OS_NAME == windows]]; then + export include="$include -I${PWD}\dest\build\native\include" + export lib="$LDFLAGS -L${PWD}\dest\build\native\lib\win\%ARCH%\win-${ARCH}-Release\v142" + export DLL_DIR="$DLL_DIR -L${PWD}\dest\runtimes\win-${ARCH}\native" +else + lib_dir=dest/runtimes/$OS_NAME-$ARCH/native + export CFLAGS="$CFLAGS -I${PWD}/dest/build/native/include" + export LDFLAGS="$LDFLAGS -L${PWD}/${lib_dir}" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/$lib_dir" + export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$PWD/$lib_dir" +fi python setup.py build && python setup.py install if [[ $OS_NAME == linux && $ARCH == x64 ]]; then From 84faaccd102c57c588f49712c3cb6caf59566111 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Wed, 8 Feb 2023 04:10:00 +0530 Subject: [PATCH 29/62] changes --- .semaphore/semaphore.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 4b0c24ac5..2806f6290 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -213,5 +213,6 @@ blocks: commands: - bash tools/mingw-w64/semaphore_commands.sh # use a virtualenv - - python3 -m venv _venv && source _venv/bin/activate + - python3 -m venv t_venv + - t_venv\Scripts\activate - bash tools/source-package-verification.sh From fa706d4c769c6625d36891c104beb185532ee49d Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Wed, 8 Feb 2023 04:48:35 +0530 Subject: [PATCH 30/62] changes --- tools/source-package-verification.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/source-package-verification.sh b/tools/source-package-verification.sh index 72f9aec8f..f58db35b9 100644 --- a/tools/source-package-verification.sh +++ b/tools/source-package-verification.sh @@ -9,7 +9,7 @@ pip install -U protobuf pip install -r tests/requirements.txt tools/wheels/install-librdkafka.sh "${LIBRDKAFKA_VERSION#v}" dest -if [[ $OS_NAME == windows]]; then +if [[ $OS_NAME == windows ]]; then export include="$include -I${PWD}\dest\build\native\include" export lib="$LDFLAGS -L${PWD}\dest\build\native\lib\win\%ARCH%\win-${ARCH}-Release\v142" export DLL_DIR="$DLL_DIR -L${PWD}\dest\runtimes\win-${ARCH}\native" From df6df6fc8992d8de9829cface5973003b172f746 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Wed, 8 Feb 2023 04:49:19 +0530 Subject: [PATCH 31/62] changes --- tools/source-package-verification.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/source-package-verification.sh b/tools/source-package-verification.sh index f58db35b9..1f4795ba3 100644 --- a/tools/source-package-verification.sh +++ b/tools/source-package-verification.sh @@ -11,7 +11,7 @@ pip install -r tests/requirements.txt tools/wheels/install-librdkafka.sh "${LIBRDKAFKA_VERSION#v}" dest if [[ $OS_NAME == windows ]]; then export include="$include -I${PWD}\dest\build\native\include" - export lib="$LDFLAGS -L${PWD}\dest\build\native\lib\win\%ARCH%\win-${ARCH}-Release\v142" + export lib="$lib -L${PWD}\dest\build\native\lib\win\%ARCH%\win-${ARCH}-Release\v142" export DLL_DIR="$DLL_DIR -L${PWD}\dest\runtimes\win-${ARCH}\native" else lib_dir=dest/runtimes/$OS_NAME-$ARCH/native From 531c397cdf48ee4d5d5ed3d7a2a91fde261f5846 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Wed, 8 Feb 2023 15:39:56 +0530 Subject: [PATCH 32/62] changes --- .semaphore/semaphore.yml | 1 + tools/windows-install-librdkafka.bat | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 2806f6290..a8c4ae8c8 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -215,4 +215,5 @@ blocks: # use a virtualenv - python3 -m venv t_venv - t_venv\Scripts\activate + - call tools/windows-install-librdkafka.bat $env:LIBRDKAFKA_VERSION.TrimStart("v") dest - bash tools/source-package-verification.sh diff --git a/tools/windows-install-librdkafka.bat b/tools/windows-install-librdkafka.bat index 74057528c..33ad031e2 100644 --- a/tools/windows-install-librdkafka.bat +++ b/tools/windows-install-librdkafka.bat @@ -13,7 +13,12 @@ rem Download required (but missing) system includes curl -s https://raw.githubusercontent.com/chemeris/msinttypes/master/inttypes.h -o inttypes.h || exit /b 1 curl -s https://raw.githubusercontent.com/chemeris/msinttypes/master/stdint.h -o stdint.h || exit /b 1 -for %%V in (27, 35, 36, 37) do ( +for %%V in (27, 35, 36, 37, 38) do ( + if %%~V!=38( + if %BUILD_WHEELS%==0( + continue + ) + ) call tools\windows-copy-librdkafka.bat %librdkafka_version% c:\Python%%~V || exit /b 1 ) From 0af7f10c61bb6c9790b897f9cb8b2fc9496ac015 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Wed, 8 Feb 2023 16:46:35 +0530 Subject: [PATCH 33/62] changes --- .semaphore/semaphore.yml | 5 ++--- tools/source-package-verification.sh | 1 + tools/windows-install-librdkafka.bat | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index a8c4ae8c8..9e9ac20ef 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -193,8 +193,6 @@ blocks: value: windows - name: ARCH value: x64 - - name: BUILD_WHEELS - value: '0' prologue: commands: - cache restore msys2-x64 @@ -210,10 +208,11 @@ blocks: value: 'yes' - name: MSYSTEM value: UCRT64 + - name: BUILD_WHEELS + value: '0' commands: - bash tools/mingw-w64/semaphore_commands.sh # use a virtualenv - python3 -m venv t_venv - t_venv\Scripts\activate - - call tools/windows-install-librdkafka.bat $env:LIBRDKAFKA_VERSION.TrimStart("v") dest - bash tools/source-package-verification.sh diff --git a/tools/source-package-verification.sh b/tools/source-package-verification.sh index 1f4795ba3..212382927 100644 --- a/tools/source-package-verification.sh +++ b/tools/source-package-verification.sh @@ -13,6 +13,7 @@ if [[ $OS_NAME == windows ]]; then export include="$include -I${PWD}\dest\build\native\include" export lib="$lib -L${PWD}\dest\build\native\lib\win\%ARCH%\win-${ARCH}-Release\v142" export DLL_DIR="$DLL_DIR -L${PWD}\dest\runtimes\win-${ARCH}\native" + tools/windows-install-librdkafka.bat "${LIBRDKAFKA_VERSION#v}" dest else lib_dir=dest/runtimes/$OS_NAME-$ARCH/native export CFLAGS="$CFLAGS -I${PWD}/dest/build/native/include" diff --git a/tools/windows-install-librdkafka.bat b/tools/windows-install-librdkafka.bat index 33ad031e2..e112261f0 100644 --- a/tools/windows-install-librdkafka.bat +++ b/tools/windows-install-librdkafka.bat @@ -21,4 +21,3 @@ for %%V in (27, 35, 36, 37, 38) do ( ) call tools\windows-copy-librdkafka.bat %librdkafka_version% c:\Python%%~V || exit /b 1 ) - From 4a3fc981446c7273b3e0b74fac8aaf3c76bf61e2 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Wed, 8 Feb 2023 17:01:12 +0530 Subject: [PATCH 34/62] changes --- tools/windows-install-librdkafka.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/windows-install-librdkafka.bat b/tools/windows-install-librdkafka.bat index e112261f0..410818d33 100644 --- a/tools/windows-install-librdkafka.bat +++ b/tools/windows-install-librdkafka.bat @@ -14,7 +14,7 @@ curl -s https://raw.githubusercontent.com/chemeris/msinttypes/master/inttypes.h curl -s https://raw.githubusercontent.com/chemeris/msinttypes/master/stdint.h -o stdint.h || exit /b 1 for %%V in (27, 35, 36, 37, 38) do ( - if %%~V!=38( + if %%V!=38( if %BUILD_WHEELS%==0( continue ) From bc1d04303ea36809b07f562e93a737f90211a1d5 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Wed, 8 Feb 2023 17:09:31 +0530 Subject: [PATCH 35/62] changes --- .semaphore/semaphore.yml | 8 +++++++- tools/source-package-verification.sh | 17 +++++------------ tools/windows-install-librdkafka.bat | 7 +------ 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 9e9ac20ef..0cd5db1a0 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -215,4 +215,10 @@ blocks: # use a virtualenv - python3 -m venv t_venv - t_venv\Scripts\activate - - bash tools/source-package-verification.sh + - bash tools/wheels/install-librdkafka.sh "${LIBRDKAFKA_VERSION#v}" dest + - set include=%cd%\%DEST%\build\native\include + - set lib=%cd%\%DEST%\build\native\lib\win\%ARCH%\win-%ARCH%-Release\v142 + - set DLL_DIR=%cd%\%DEST%\runtimes\win-%ARCH%\native + - python setup.py build + - python setup.py install + - python -m pytest --timeout 600 --ignore=dest --ignore=tests/integration diff --git a/tools/source-package-verification.sh b/tools/source-package-verification.sh index 212382927..570f4e8d5 100644 --- a/tools/source-package-verification.sh +++ b/tools/source-package-verification.sh @@ -8,19 +8,12 @@ pip install -r docs/requirements.txt pip install -U protobuf pip install -r tests/requirements.txt +lib_dir=dest/runtimes/$OS_NAME-$ARCH/native tools/wheels/install-librdkafka.sh "${LIBRDKAFKA_VERSION#v}" dest -if [[ $OS_NAME == windows ]]; then - export include="$include -I${PWD}\dest\build\native\include" - export lib="$lib -L${PWD}\dest\build\native\lib\win\%ARCH%\win-${ARCH}-Release\v142" - export DLL_DIR="$DLL_DIR -L${PWD}\dest\runtimes\win-${ARCH}\native" - tools/windows-install-librdkafka.bat "${LIBRDKAFKA_VERSION#v}" dest -else - lib_dir=dest/runtimes/$OS_NAME-$ARCH/native - export CFLAGS="$CFLAGS -I${PWD}/dest/build/native/include" - export LDFLAGS="$LDFLAGS -L${PWD}/${lib_dir}" - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/$lib_dir" - export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$PWD/$lib_dir" -fi +export CFLAGS="$CFLAGS -I${PWD}/dest/build/native/include" +export LDFLAGS="$LDFLAGS -L${PWD}/${lib_dir}" +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/$lib_dir" +export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$PWD/$lib_dir" python setup.py build && python setup.py install if [[ $OS_NAME == linux && $ARCH == x64 ]]; then diff --git a/tools/windows-install-librdkafka.bat b/tools/windows-install-librdkafka.bat index 410818d33..83221332e 100644 --- a/tools/windows-install-librdkafka.bat +++ b/tools/windows-install-librdkafka.bat @@ -13,11 +13,6 @@ rem Download required (but missing) system includes curl -s https://raw.githubusercontent.com/chemeris/msinttypes/master/inttypes.h -o inttypes.h || exit /b 1 curl -s https://raw.githubusercontent.com/chemeris/msinttypes/master/stdint.h -o stdint.h || exit /b 1 -for %%V in (27, 35, 36, 37, 38) do ( - if %%V!=38( - if %BUILD_WHEELS%==0( - continue - ) - ) +for %%V in (27, 35, 36, 37) do ( call tools\windows-copy-librdkafka.bat %librdkafka_version% c:\Python%%~V || exit /b 1 ) From beb89852b04f6645c889add574d07e80cfcad114 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Wed, 8 Feb 2023 17:14:41 +0530 Subject: [PATCH 36/62] changes --- .semaphore/semaphore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 0cd5db1a0..3f6ce8ee7 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -215,7 +215,7 @@ blocks: # use a virtualenv - python3 -m venv t_venv - t_venv\Scripts\activate - - bash tools/wheels/install-librdkafka.sh "${LIBRDKAFKA_VERSION#v}" dest + - bash tools/wheels/install-librdkafka.sh $env:LIBRDKAFKA_VERSION.TrimStart("v") dest - set include=%cd%\%DEST%\build\native\include - set lib=%cd%\%DEST%\build\native\lib\win\%ARCH%\win-%ARCH%-Release\v142 - set DLL_DIR=%cd%\%DEST%\runtimes\win-%ARCH%\native From 2fc952ae94bd4912cea4deb2da46ca4554b3e2be Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Wed, 8 Feb 2023 19:51:55 +0530 Subject: [PATCH 37/62] linux amd wheel generation --- .semaphore/semaphore.yml | 63 +++++++++++++--------------------------- CHANGELOG.md | 2 ++ 2 files changed, 22 insertions(+), 43 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 3f6ce8ee7..579d60723 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -108,10 +108,29 @@ blocks: - ./tools/build-manylinux.sh "${LIBRDKAFKA_VERSION#v}" - tar -czf wheelhouse-linux-${ARCH}.tgz wheelhouse - artifact push workflow wheelhouse-linux-${ARCH}.tgz - - name: "Wheels: Windows" + - name: "Wheels: Linux x64" # run: # when: "tag =~ '.*'" dependencies: [] + task: + agent: + machine: + type: s1-prod-ubuntu20-04-amd64-3 + env_vars: + - name: OS_NAME + value: linux + - name: ARCH + value: x64 + jobs: + - name: Build + commands: + - ./tools/build-manylinux.sh "${LIBRDKAFKA_VERSION#v}" + - tar -czf wheelhouse-linux-${ARCH}.tgz wheelhouse + - artifact push workflow wheelhouse-linux-${ARCH}.tgz + - name: "Wheels: Windows" + run: + when: "tag =~ '.*'" + dependencies: [] task: agent: machine: @@ -136,8 +155,6 @@ blocks: value: 'yes' - name: MSYSTEM value: UCRT64 - - name: BUILD_WHEELS - value: '1' commands: - bash tools/mingw-w64/semaphore_commands.sh - bash tools/wheels/install-librdkafka.sh $env:LIBRDKAFKA_VERSION.TrimStart("v") dest @@ -182,43 +199,3 @@ blocks: - python3 -m venv _venv && source _venv/bin/activate - chmod u+r+x tools/source-package-verification.sh - tools/source-package-verification.sh - - name: Source package verification with Python 3 (Windows) - dependencies: [] - task: - agent: - machine: - type: s1-prod-windows - env_vars: - - name: OS_NAME - value: windows - - name: ARCH - value: x64 - prologue: - commands: - - cache restore msys2-x64 - - ".\\tools\\mingw-w64\\setup-msys2.ps1" - - $env:PATH = 'C:\msys64\usr\bin;' + $env:PATH - - bash -lc './tools/mingw-w64/msys2-dependencies.sh' - - cache delete msys2-x64 - - cache store msys2-x64 c:/msys64 - jobs: - - name: Build - env_vars: - - name: CHERE_INVOKING - value: 'yes' - - name: MSYSTEM - value: UCRT64 - - name: BUILD_WHEELS - value: '0' - commands: - - bash tools/mingw-w64/semaphore_commands.sh - # use a virtualenv - - python3 -m venv t_venv - - t_venv\Scripts\activate - - bash tools/wheels/install-librdkafka.sh $env:LIBRDKAFKA_VERSION.TrimStart("v") dest - - set include=%cd%\%DEST%\build\native\include - - set lib=%cd%\%DEST%\build\native\lib\win\%ARCH%\win-%ARCH%-Release\v142 - - set DLL_DIR=%cd%\%DEST%\runtimes\win-%ARCH%\native - - python setup.py build - - python setup.py install - - python -m pytest --timeout 600 --ignore=dest --ignore=tests/integration diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d452b6ec..5e790e103 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ - Added support for Default num_partitions in CreateTopics Admin API. - Added support for password protected private key in CachedSchemaRegistryClient. - Add reference support in Schema Registry client. (@RickTalken, #1304) +- Migrated travis jobs to Semaphore CI (#1503) + ## v2.0.2 From dfcecda7ffc4659fb4bb2361d4a64651d94909f7 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Wed, 8 Feb 2023 19:59:12 +0530 Subject: [PATCH 38/62] final format changes --- .semaphore/semaphore.yml | 80 ++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 579d60723..00ae68568 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -51,44 +51,6 @@ blocks: - PIP_INSTALL_OPTIONS="--user" tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" wheelhouse - tar -czf wheelhouse-macOS-${ARCH}.tgz wheelhouse - artifact push workflow wheelhouse-macOS-${ARCH}.tgz - - name: Source package verification with Python 3 (OSX arm64) +docs - dependencies: [] - task: - agent: - machine: - type: s1-prod-macos-arm64 - env_vars: - - name: OS_NAME - value: osx - - name: ARCH - value: arm64 - jobs: - - name: Build - commands: - - sem-version python 3.8 - # use a virtualenv - - python3 -m venv _venv && source _venv/bin/activate - - chmod u+r+x tools/source-package-verification.sh - - tools/source-package-verification.sh - - name: Source package verification with Python 3 (OSX x64) +docs - dependencies: [] - task: - agent: - machine: - type: s1-prod-macos - env_vars: - - name: OS_NAME - value: osx - - name: ARCH - value: x64 - jobs: - - name: Build - commands: - - sem-version python 3.8 - # use a virtualenv - - python3 -m venv _venv && source _venv/bin/activate - - chmod u+r+x tools/source-package-verification.sh - - tools/source-package-verification.sh - name: "Wheels: Linux arm64" run: when: "tag =~ '.*'" @@ -109,8 +71,8 @@ blocks: - tar -czf wheelhouse-linux-${ARCH}.tgz wheelhouse - artifact push workflow wheelhouse-linux-${ARCH}.tgz - name: "Wheels: Linux x64" - # run: - # when: "tag =~ '.*'" + run: + when: "tag =~ '.*'" dependencies: [] task: agent: @@ -199,3 +161,41 @@ blocks: - python3 -m venv _venv && source _venv/bin/activate - chmod u+r+x tools/source-package-verification.sh - tools/source-package-verification.sh + - name: Source package verification with Python 3 (OSX x64) +docs + dependencies: [] + task: + agent: + machine: + type: s1-prod-macos + env_vars: + - name: OS_NAME + value: osx + - name: ARCH + value: x64 + jobs: + - name: Build + commands: + - sem-version python 3.8 + # use a virtualenv + - python3 -m venv _venv && source _venv/bin/activate + - chmod u+r+x tools/source-package-verification.sh + - tools/source-package-verification.sh + - name: Source package verification with Python 3 (OSX arm64) +docs + dependencies: [] + task: + agent: + machine: + type: s1-prod-macos-arm64 + env_vars: + - name: OS_NAME + value: osx + - name: ARCH + value: arm64 + jobs: + - name: Build + commands: + - sem-version python 3.8 + # use a virtualenv + - python3 -m venv _venv && source _venv/bin/activate + - chmod u+r+x tools/source-package-verification.sh + - tools/source-package-verification.sh From 75f289388eccf76ba1a963c72f4530cd9f2f81fb Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Mon, 13 Feb 2023 19:17:07 +0530 Subject: [PATCH 39/62] changes --- .semaphore/semaphore.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 00ae68568..b84083b40 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -71,8 +71,8 @@ blocks: - tar -czf wheelhouse-linux-${ARCH}.tgz wheelhouse - artifact push workflow wheelhouse-linux-${ARCH}.tgz - name: "Wheels: Linux x64" - run: - when: "tag =~ '.*'" + # run: + # when: "tag =~ '.*'" dependencies: [] task: agent: @@ -86,7 +86,7 @@ blocks: jobs: - name: Build commands: - - ./tools/build-manylinux.sh "${LIBRDKAFKA_VERSION#v}" + - ./tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" - tar -czf wheelhouse-linux-${ARCH}.tgz wheelhouse - artifact push workflow wheelhouse-linux-${ARCH}.tgz - name: "Wheels: Windows" From 8971644e12337412b91274540cc1ae740a96bc89 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Mon, 13 Feb 2023 19:17:44 +0530 Subject: [PATCH 40/62] changes --- .semaphore/semaphore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index b84083b40..12a6d8041 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -86,7 +86,7 @@ blocks: jobs: - name: Build commands: - - ./tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" + - ./tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" wheelhouse - tar -czf wheelhouse-linux-${ARCH}.tgz wheelhouse - artifact push workflow wheelhouse-linux-${ARCH}.tgz - name: "Wheels: Windows" From 6d8035cf933e36059ab4019c2bf2691ffef962a5 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Mon, 13 Feb 2023 19:30:42 +0530 Subject: [PATCH 41/62] changes --- .semaphore/semaphore.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 12a6d8041..630d312fc 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -71,8 +71,8 @@ blocks: - tar -czf wheelhouse-linux-${ARCH}.tgz wheelhouse - artifact push workflow wheelhouse-linux-${ARCH}.tgz - name: "Wheels: Linux x64" - # run: - # when: "tag =~ '.*'" + run: + when: "tag =~ '.*'" dependencies: [] task: agent: From 21e1b9ded77733a01a478fec4a9274a14e23789a Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Wed, 15 Feb 2023 17:15:59 +0530 Subject: [PATCH 42/62] excluded venv from flake8 --- .flake8 | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .flake8 diff --git a/.flake8 b/.flake8 new file mode 100644 index 000000000..8204acd65 --- /dev/null +++ b/.flake8 @@ -0,0 +1,4 @@ +[flake8] +exclude = + ./_venv + \ No newline at end of file From 727c5e619219300e4f402cc007c5d6eaa34a5c4a Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Thu, 16 Feb 2023 10:34:06 +0530 Subject: [PATCH 43/62] changes --- .flake8 | 4 ---- .semaphore/semaphore.yml | 4 ++-- tools/source-package-verification.sh | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 .flake8 diff --git a/.flake8 b/.flake8 deleted file mode 100644 index 8204acd65..000000000 --- a/.flake8 +++ /dev/null @@ -1,4 +0,0 @@ -[flake8] -exclude = - ./_venv - \ No newline at end of file diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 630d312fc..12a6d8041 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -71,8 +71,8 @@ blocks: - tar -czf wheelhouse-linux-${ARCH}.tgz wheelhouse - artifact push workflow wheelhouse-linux-${ARCH}.tgz - name: "Wheels: Linux x64" - run: - when: "tag =~ '.*'" + # run: + # when: "tag =~ '.*'" dependencies: [] task: agent: diff --git a/tools/source-package-verification.sh b/tools/source-package-verification.sh index 570f4e8d5..a220a8d98 100644 --- a/tools/source-package-verification.sh +++ b/tools/source-package-verification.sh @@ -17,7 +17,7 @@ export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$PWD/$lib_dir" python setup.py build && python setup.py install if [[ $OS_NAME == linux && $ARCH == x64 ]]; then - flake8 + flake8 --exclude ./_venv make docs python -m pytest --timeout 600 --ignore=dest else From 5c46b35ebd86fbe8ff0f38068e9190cd848a6bda Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Thu, 16 Feb 2023 11:02:46 +0530 Subject: [PATCH 44/62] excluded _venv for flake8 --- .semaphore/semaphore.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 12a6d8041..046298ec3 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -71,8 +71,6 @@ blocks: - tar -czf wheelhouse-linux-${ARCH}.tgz wheelhouse - artifact push workflow wheelhouse-linux-${ARCH}.tgz - name: "Wheels: Linux x64" - # run: - # when: "tag =~ '.*'" dependencies: [] task: agent: From 087829acea1291d2e983ca261ee797e8bc912f57 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Thu, 16 Feb 2023 11:03:33 +0530 Subject: [PATCH 45/62] excluded _venv for flake8 --- .semaphore/semaphore.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 046298ec3..630d312fc 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -71,6 +71,8 @@ blocks: - tar -czf wheelhouse-linux-${ARCH}.tgz wheelhouse - artifact push workflow wheelhouse-linux-${ARCH}.tgz - name: "Wheels: Linux x64" + run: + when: "tag =~ '.*'" dependencies: [] task: agent: From f1f2eaa72c49146f6f6c51cd0092ff0d6e19ab74 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Thu, 16 Feb 2023 16:03:07 +0530 Subject: [PATCH 46/62] windows wheels fix --- tools/mingw-w64/semaphore_commands.sh | 2 +- tools/source-package-verification.sh | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/mingw-w64/semaphore_commands.sh b/tools/mingw-w64/semaphore_commands.sh index afd82da94..fe9d0695d 100644 --- a/tools/mingw-w64/semaphore_commands.sh +++ b/tools/mingw-w64/semaphore_commands.sh @@ -8,4 +8,4 @@ export MAKE=mingw32-make # so that Autotools can find it cmd /c mklink /D C:\Python38\python3.exe C:\Python38\python.exe -if [[ $BUILD_WHEELS == '1' ]]; then python -m pip install cibuildwheel==2.12.0;fi +python -m pip install cibuildwheel==2.12.0;fi diff --git a/tools/source-package-verification.sh b/tools/source-package-verification.sh index a220a8d98..a64898f94 100644 --- a/tools/source-package-verification.sh +++ b/tools/source-package-verification.sh @@ -19,7 +19,5 @@ python setup.py build && python setup.py install if [[ $OS_NAME == linux && $ARCH == x64 ]]; then flake8 --exclude ./_venv make docs - python -m pytest --timeout 600 --ignore=dest -else - python -m pytest --timeout 600 --ignore=dest --ignore=tests/integration fi +python -m pytest --timeout 600 --ignore=dest --ignore=tests/integration From a07c29d898785522d00e06693d7c6aa9e3cbb67e Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Thu, 16 Feb 2023 16:12:43 +0530 Subject: [PATCH 47/62] windows wheels fix --- tools/mingw-w64/semaphore_commands.sh | 2 +- tools/source-package-verification.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/mingw-w64/semaphore_commands.sh b/tools/mingw-w64/semaphore_commands.sh index fe9d0695d..2fbe5edee 100644 --- a/tools/mingw-w64/semaphore_commands.sh +++ b/tools/mingw-w64/semaphore_commands.sh @@ -8,4 +8,4 @@ export MAKE=mingw32-make # so that Autotools can find it cmd /c mklink /D C:\Python38\python3.exe C:\Python38\python.exe -python -m pip install cibuildwheel==2.12.0;fi +python -m pip install cibuildwheel==2.12.0 diff --git a/tools/source-package-verification.sh b/tools/source-package-verification.sh index a64898f94..a220a8d98 100644 --- a/tools/source-package-verification.sh +++ b/tools/source-package-verification.sh @@ -19,5 +19,7 @@ python setup.py build && python setup.py install if [[ $OS_NAME == linux && $ARCH == x64 ]]; then flake8 --exclude ./_venv make docs + python -m pytest --timeout 600 --ignore=dest +else + python -m pytest --timeout 600 --ignore=dest --ignore=tests/integration fi -python -m pytest --timeout 600 --ignore=dest --ignore=tests/integration From 85ffc2c080d6ee06418acc6ccea2017296ad4f5e Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Mon, 20 Feb 2023 19:56:36 +0530 Subject: [PATCH 48/62] packaging artifacts into tar --- .semaphore/semaphore.yml | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 630d312fc..ec13ba7a6 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -123,7 +123,7 @@ blocks: - tools/wheels/build-wheels.bat x64 win_amd64 dest wheelhouse - tar -czf wheelhouse-windows-${ARCH}.tgz wheelhouse - artifact push workflow wheelhouse-windows-${ARCH}.tgz - - name: Source package verification with Python 3 (Linux x64) + - name: "Source package verification and Integration tests with Python 3 (Linux x64)" dependencies: [] task: agent: @@ -142,7 +142,7 @@ blocks: - python3 -m venv _venv && source _venv/bin/activate - chmod u+r+x tools/source-package-verification.sh - tools/source-package-verification.sh - - name: Source package verification with Python 3 (Linux arm64) + - name: "Source package verification with Python 3 (Linux arm64)" dependencies: [] task: agent: @@ -161,7 +161,7 @@ blocks: - python3 -m venv _venv && source _venv/bin/activate - chmod u+r+x tools/source-package-verification.sh - tools/source-package-verification.sh - - name: Source package verification with Python 3 (OSX x64) +docs + - name: "Source package verification with Python 3 (OSX x64) +docs" dependencies: [] task: agent: @@ -180,7 +180,7 @@ blocks: - python3 -m venv _venv && source _venv/bin/activate - chmod u+r+x tools/source-package-verification.sh - tools/source-package-verification.sh - - name: Source package verification with Python 3 (OSX arm64) +docs + - name: "Source package verification with Python 3 (OSX arm64) +docs" dependencies: [] task: agent: @@ -199,3 +199,28 @@ blocks: - python3 -m venv _venv && source _venv/bin/activate - chmod u+r+x tools/source-package-verification.sh - tools/source-package-verification.sh + - name: "Packaging" + run: + when: "tag =~ '.*'" + dependencies: + - "Wheels: OSX x64" + - "Wheels: OSX arm64" + - "Wheels: Linux arm64" + - "Wheels: Linux x64" + - "Wheels: Windows" + task: + agent: + machine: + type: s1-prod-ubuntu20-04-amd64-3 + jobs: + - name: "Packaging all artifacts" + commands: + - artifact pull workflow artifacts + - mkdir -p packages + - cp -v artifacts/wheelhouse-*.tgz packages + - cd packages + - tar cvf confluent-kafka-python-wheels-${SEMAPHORE_GIT_TAG_NAME}-${SEMAPHORE_WORKFLOW_ID}.tar . + - ls -la + - sha256sum * + - artifact push workflow confluent-kafka-python-wheels-${SEMAPHORE_GIT_TAG_NAME}-${SEMAPHORE_WORKFLOW_ID} + - echo Thank you From fd325886d64c237305aa5845cc84555f57bd2c34 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Mon, 20 Feb 2023 21:04:48 +0530 Subject: [PATCH 49/62] packaging artifacts into tar --- .semaphore/semaphore.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index ec13ba7a6..b0fdd2874 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -212,15 +212,15 @@ blocks: agent: machine: type: s1-prod-ubuntu20-04-amd64-3 - jobs: - - name: "Packaging all artifacts" - commands: - - artifact pull workflow artifacts - - mkdir -p packages - - cp -v artifacts/wheelhouse-*.tgz packages - - cd packages - - tar cvf confluent-kafka-python-wheels-${SEMAPHORE_GIT_TAG_NAME}-${SEMAPHORE_WORKFLOW_ID}.tar . - - ls -la - - sha256sum * - - artifact push workflow confluent-kafka-python-wheels-${SEMAPHORE_GIT_TAG_NAME}-${SEMAPHORE_WORKFLOW_ID} - - echo Thank you + jobs: + - name: "Packaging all artifacts" + commands: + - artifact pull workflow artifacts + - mkdir -p packages + - cp -v artifacts/wheelhouse-*.tgz packages + - cd packages + - tar cvf confluent-kafka-python-wheels-${SEMAPHORE_GIT_TAG_NAME}-${SEMAPHORE_WORKFLOW_ID}.tar . + - ls -la + - sha256sum * + - artifact push workflow confluent-kafka-python-wheels-${SEMAPHORE_GIT_TAG_NAME}-${SEMAPHORE_WORKFLOW_ID} + - echo Thank you From 93619ab82a6ab5361998315846f86f45576612a7 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Mon, 20 Feb 2023 21:36:24 +0530 Subject: [PATCH 50/62] packaging artifacts into tar --- .semaphore/semaphore.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index b0fdd2874..f9c0437a9 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -12,8 +12,8 @@ global_job_config: - checkout blocks: - name: "Wheels: OSX x64" - run: - when: "tag =~ '.*'" + # run: + # when: "tag =~ '.*'" dependencies: [] task: agent: @@ -31,8 +31,8 @@ blocks: - tar -czf wheelhouse-macOS-${ARCH}.tgz wheelhouse - artifact push workflow wheelhouse-macOS-${ARCH}.tgz - name: "Wheels: OSX arm64" - run: - when: "tag =~ '.*'" + # run: + # when: "tag =~ '.*'" dependencies: [] task: agent: @@ -52,8 +52,8 @@ blocks: - tar -czf wheelhouse-macOS-${ARCH}.tgz wheelhouse - artifact push workflow wheelhouse-macOS-${ARCH}.tgz - name: "Wheels: Linux arm64" - run: - when: "tag =~ '.*'" + # run: + # when: "tag =~ '.*'" dependencies: [] task: agent: @@ -71,8 +71,8 @@ blocks: - tar -czf wheelhouse-linux-${ARCH}.tgz wheelhouse - artifact push workflow wheelhouse-linux-${ARCH}.tgz - name: "Wheels: Linux x64" - run: - when: "tag =~ '.*'" + # run: + # when: "tag =~ '.*'" dependencies: [] task: agent: @@ -200,8 +200,8 @@ blocks: - chmod u+r+x tools/source-package-verification.sh - tools/source-package-verification.sh - name: "Packaging" - run: - when: "tag =~ '.*'" + # run: + # when: "tag =~ '.*'" dependencies: - "Wheels: OSX x64" - "Wheels: OSX arm64" @@ -217,6 +217,7 @@ blocks: commands: - artifact pull workflow artifacts - mkdir -p packages + - ls - cp -v artifacts/wheelhouse-*.tgz packages - cd packages - tar cvf confluent-kafka-python-wheels-${SEMAPHORE_GIT_TAG_NAME}-${SEMAPHORE_WORKFLOW_ID}.tar . From 749816c2ccd3c6d6eb272baee5ace57bcbf13c83 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Tue, 21 Feb 2023 01:30:08 +0530 Subject: [PATCH 51/62] artifacts directory created --- .semaphore/semaphore.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index f9c0437a9..e2cc8ca43 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -10,6 +10,7 @@ global_job_config: prologue: commands: - checkout + - mkdir artifacts blocks: - name: "Wheels: OSX x64" # run: @@ -29,7 +30,7 @@ blocks: commands: - PIP_INSTALL_OPTIONS="--user" tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" wheelhouse - tar -czf wheelhouse-macOS-${ARCH}.tgz wheelhouse - - artifact push workflow wheelhouse-macOS-${ARCH}.tgz + - artifact push workflow artifacts/wheelhouse-macOS-${ARCH}.tgz - name: "Wheels: OSX arm64" # run: # when: "tag =~ '.*'" @@ -50,7 +51,7 @@ blocks: commands: - PIP_INSTALL_OPTIONS="--user" tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" wheelhouse - tar -czf wheelhouse-macOS-${ARCH}.tgz wheelhouse - - artifact push workflow wheelhouse-macOS-${ARCH}.tgz + - artifact push workflow artifacts/wheelhouse-macOS-${ARCH}.tgz - name: "Wheels: Linux arm64" # run: # when: "tag =~ '.*'" @@ -69,7 +70,7 @@ blocks: commands: - ./tools/build-manylinux.sh "${LIBRDKAFKA_VERSION#v}" - tar -czf wheelhouse-linux-${ARCH}.tgz wheelhouse - - artifact push workflow wheelhouse-linux-${ARCH}.tgz + - artifact push workflow artifacts/wheelhouse-linux-${ARCH}.tgz - name: "Wheels: Linux x64" # run: # when: "tag =~ '.*'" @@ -88,10 +89,10 @@ blocks: commands: - ./tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" wheelhouse - tar -czf wheelhouse-linux-${ARCH}.tgz wheelhouse - - artifact push workflow wheelhouse-linux-${ARCH}.tgz + - artifact push workflow artifacts/wheelhouse-linux-${ARCH}.tgz - name: "Wheels: Windows" - run: - when: "tag =~ '.*'" + # run: + # when: "tag =~ '.*'" dependencies: [] task: agent: @@ -122,7 +123,7 @@ blocks: - bash tools/wheels/install-librdkafka.sh $env:LIBRDKAFKA_VERSION.TrimStart("v") dest - tools/wheels/build-wheels.bat x64 win_amd64 dest wheelhouse - tar -czf wheelhouse-windows-${ARCH}.tgz wheelhouse - - artifact push workflow wheelhouse-windows-${ARCH}.tgz + - artifact push workflow artifacts/wheelhouse-windows-${ARCH}.tgz - name: "Source package verification and Integration tests with Python 3 (Linux x64)" dependencies: [] task: From e4cc95510d17d21b280a5b90e7c2114f2e3021f5 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Tue, 21 Feb 2023 04:04:02 +0530 Subject: [PATCH 52/62] artifacts directory changes --- .semaphore/semaphore.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index e2cc8ca43..c3410197b 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -30,7 +30,7 @@ blocks: commands: - PIP_INSTALL_OPTIONS="--user" tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" wheelhouse - tar -czf wheelhouse-macOS-${ARCH}.tgz wheelhouse - - artifact push workflow artifacts/wheelhouse-macOS-${ARCH}.tgz + - artifact push workflow wheelhouse-macOS-${ARCH}.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}/ - name: "Wheels: OSX arm64" # run: # when: "tag =~ '.*'" @@ -51,7 +51,7 @@ blocks: commands: - PIP_INSTALL_OPTIONS="--user" tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" wheelhouse - tar -czf wheelhouse-macOS-${ARCH}.tgz wheelhouse - - artifact push workflow artifacts/wheelhouse-macOS-${ARCH}.tgz + - artifact push workflow wheelhouse-macOS-${ARCH}.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}/ - name: "Wheels: Linux arm64" # run: # when: "tag =~ '.*'" @@ -70,7 +70,7 @@ blocks: commands: - ./tools/build-manylinux.sh "${LIBRDKAFKA_VERSION#v}" - tar -czf wheelhouse-linux-${ARCH}.tgz wheelhouse - - artifact push workflow artifacts/wheelhouse-linux-${ARCH}.tgz + - artifact push workflow wheelhouse-linux-${ARCH}.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}/ - name: "Wheels: Linux x64" # run: # when: "tag =~ '.*'" @@ -89,7 +89,7 @@ blocks: commands: - ./tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" wheelhouse - tar -czf wheelhouse-linux-${ARCH}.tgz wheelhouse - - artifact push workflow artifacts/wheelhouse-linux-${ARCH}.tgz + - artifact push workflow wheelhouse-linux-${ARCH}.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}/ - name: "Wheels: Windows" # run: # when: "tag =~ '.*'" @@ -123,7 +123,7 @@ blocks: - bash tools/wheels/install-librdkafka.sh $env:LIBRDKAFKA_VERSION.TrimStart("v") dest - tools/wheels/build-wheels.bat x64 win_amd64 dest wheelhouse - tar -czf wheelhouse-windows-${ARCH}.tgz wheelhouse - - artifact push workflow artifacts/wheelhouse-windows-${ARCH}.tgz + - artifact push workflow wheelhouse-windows-${ARCH}.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}/ - name: "Source package verification and Integration tests with Python 3 (Linux x64)" dependencies: [] task: @@ -217,10 +217,7 @@ blocks: - name: "Packaging all artifacts" commands: - artifact pull workflow artifacts - - mkdir -p packages - - ls - - cp -v artifacts/wheelhouse-*.tgz packages - - cd packages + - cd artifacts - tar cvf confluent-kafka-python-wheels-${SEMAPHORE_GIT_TAG_NAME}-${SEMAPHORE_WORKFLOW_ID}.tar . - ls -la - sha256sum * From 10b1b85dcc8cdd1a36a741c1b62ff4dd026a233d Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Tue, 21 Feb 2023 06:09:37 +0530 Subject: [PATCH 53/62] artifacts directory changes --- .semaphore/semaphore.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index c3410197b..7c77c5179 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -221,5 +221,6 @@ blocks: - tar cvf confluent-kafka-python-wheels-${SEMAPHORE_GIT_TAG_NAME}-${SEMAPHORE_WORKFLOW_ID}.tar . - ls -la - sha256sum * - - artifact push workflow confluent-kafka-python-wheels-${SEMAPHORE_GIT_TAG_NAME}-${SEMAPHORE_WORKFLOW_ID} + - cd .. + - artifact push project artifacts --destination confluent-kafka-python-wheels-${SEMAPHORE_GIT_TAG_NAME}-${SEMAPHORE_WORKFLOW_ID} - echo Thank you From 524d208e436a0bcd29a4732b8d07705a895b3081 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Tue, 21 Feb 2023 12:29:45 +0530 Subject: [PATCH 54/62] packaging on tags only --- .semaphore/semaphore.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 7c77c5179..bc2b35a19 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -13,8 +13,8 @@ global_job_config: - mkdir artifacts blocks: - name: "Wheels: OSX x64" - # run: - # when: "tag =~ '.*'" + run: + when: "tag =~ '.*'" dependencies: [] task: agent: @@ -32,8 +32,8 @@ blocks: - tar -czf wheelhouse-macOS-${ARCH}.tgz wheelhouse - artifact push workflow wheelhouse-macOS-${ARCH}.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}/ - name: "Wheels: OSX arm64" - # run: - # when: "tag =~ '.*'" + run: + when: "tag =~ '.*'" dependencies: [] task: agent: @@ -53,8 +53,8 @@ blocks: - tar -czf wheelhouse-macOS-${ARCH}.tgz wheelhouse - artifact push workflow wheelhouse-macOS-${ARCH}.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}/ - name: "Wheels: Linux arm64" - # run: - # when: "tag =~ '.*'" + run: + when: "tag =~ '.*'" dependencies: [] task: agent: @@ -72,8 +72,8 @@ blocks: - tar -czf wheelhouse-linux-${ARCH}.tgz wheelhouse - artifact push workflow wheelhouse-linux-${ARCH}.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}/ - name: "Wheels: Linux x64" - # run: - # when: "tag =~ '.*'" + run: + when: "tag =~ '.*'" dependencies: [] task: agent: @@ -91,8 +91,8 @@ blocks: - tar -czf wheelhouse-linux-${ARCH}.tgz wheelhouse - artifact push workflow wheelhouse-linux-${ARCH}.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}/ - name: "Wheels: Windows" - # run: - # when: "tag =~ '.*'" + run: + when: "tag =~ '.*'" dependencies: [] task: agent: @@ -123,7 +123,7 @@ blocks: - bash tools/wheels/install-librdkafka.sh $env:LIBRDKAFKA_VERSION.TrimStart("v") dest - tools/wheels/build-wheels.bat x64 win_amd64 dest wheelhouse - tar -czf wheelhouse-windows-${ARCH}.tgz wheelhouse - - artifact push workflow wheelhouse-windows-${ARCH}.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}/ + - bash artifact push workflow wheelhouse-windows-${ARCH}.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}/ - name: "Source package verification and Integration tests with Python 3 (Linux x64)" dependencies: [] task: @@ -201,8 +201,8 @@ blocks: - chmod u+r+x tools/source-package-verification.sh - tools/source-package-verification.sh - name: "Packaging" - # run: - # when: "tag =~ '.*'" + run: + when: "tag =~ '.*'" dependencies: - "Wheels: OSX x64" - "Wheels: OSX arm64" From edfac6d00df3e672aa0275689287de7be0b9560c Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Tue, 21 Feb 2023 13:02:56 +0530 Subject: [PATCH 55/62] packaging on tags only --- .semaphore/semaphore.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index bc2b35a19..4a3015799 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -122,8 +122,8 @@ blocks: - bash tools/mingw-w64/semaphore_commands.sh - bash tools/wheels/install-librdkafka.sh $env:LIBRDKAFKA_VERSION.TrimStart("v") dest - tools/wheels/build-wheels.bat x64 win_amd64 dest wheelhouse - - tar -czf wheelhouse-windows-${ARCH}.tgz wheelhouse - - bash artifact push workflow wheelhouse-windows-${ARCH}.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}/ + - tar -czf wheelhouse-windows-${Env:ARCH}.tgz wheelhouse + - artifact push workflow wheelhouse-windows-${Env:ARCH}.tgz --destination artifacts/wheels-${Env:OS_NAME}-${Env:ARCH}/ - name: "Source package verification and Integration tests with Python 3 (Linux x64)" dependencies: [] task: From 1dbb6f3d2a571ec9949891a45e11b92a069814f8 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Tue, 21 Feb 2023 15:50:46 +0530 Subject: [PATCH 56/62] tgz extension added --- .semaphore/semaphore.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 4a3015799..8fd900860 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -30,7 +30,7 @@ blocks: commands: - PIP_INSTALL_OPTIONS="--user" tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" wheelhouse - tar -czf wheelhouse-macOS-${ARCH}.tgz wheelhouse - - artifact push workflow wheelhouse-macOS-${ARCH}.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}/ + - artifact push workflow wheelhouse-macOS-${ARCH}.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}.tgz/ - name: "Wheels: OSX arm64" run: when: "tag =~ '.*'" @@ -51,7 +51,7 @@ blocks: commands: - PIP_INSTALL_OPTIONS="--user" tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" wheelhouse - tar -czf wheelhouse-macOS-${ARCH}.tgz wheelhouse - - artifact push workflow wheelhouse-macOS-${ARCH}.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}/ + - artifact push workflow wheelhouse-macOS-${ARCH}.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}.tgz/ - name: "Wheels: Linux arm64" run: when: "tag =~ '.*'" @@ -70,7 +70,7 @@ blocks: commands: - ./tools/build-manylinux.sh "${LIBRDKAFKA_VERSION#v}" - tar -czf wheelhouse-linux-${ARCH}.tgz wheelhouse - - artifact push workflow wheelhouse-linux-${ARCH}.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}/ + - artifact push workflow wheelhouse-linux-${ARCH}.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}.tgz/ - name: "Wheels: Linux x64" run: when: "tag =~ '.*'" @@ -89,7 +89,7 @@ blocks: commands: - ./tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" wheelhouse - tar -czf wheelhouse-linux-${ARCH}.tgz wheelhouse - - artifact push workflow wheelhouse-linux-${ARCH}.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}/ + - artifact push workflow wheelhouse-linux-${ARCH}.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}.tgz/ - name: "Wheels: Windows" run: when: "tag =~ '.*'" @@ -123,7 +123,7 @@ blocks: - bash tools/wheels/install-librdkafka.sh $env:LIBRDKAFKA_VERSION.TrimStart("v") dest - tools/wheels/build-wheels.bat x64 win_amd64 dest wheelhouse - tar -czf wheelhouse-windows-${Env:ARCH}.tgz wheelhouse - - artifact push workflow wheelhouse-windows-${Env:ARCH}.tgz --destination artifacts/wheels-${Env:OS_NAME}-${Env:ARCH}/ + - artifact push workflow wheelhouse-windows-${Env:ARCH}.tgz --destination artifacts/wheels-${Env:OS_NAME}-${Env:ARCH}.tgz/ - name: "Source package verification and Integration tests with Python 3 (Linux x64)" dependencies: [] task: From 7205663362dc4b1063ae0308929b967fc5de5c52 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Mon, 13 Mar 2023 19:57:04 +0530 Subject: [PATCH 57/62] python to python3 --- tools/mingw-w64/semaphore_commands.sh | 2 +- tools/wheels/build-wheels.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/mingw-w64/semaphore_commands.sh b/tools/mingw-w64/semaphore_commands.sh index 2fbe5edee..dfe30d199 100644 --- a/tools/mingw-w64/semaphore_commands.sh +++ b/tools/mingw-w64/semaphore_commands.sh @@ -8,4 +8,4 @@ export MAKE=mingw32-make # so that Autotools can find it cmd /c mklink /D C:\Python38\python3.exe C:\Python38\python.exe -python -m pip install cibuildwheel==2.12.0 +python3 -m pip install cibuildwheel==2.12.0 diff --git a/tools/wheels/build-wheels.bat b/tools/wheels/build-wheels.bat index 53ad6e856..8c5ef3e76 100644 --- a/tools/wheels/build-wheels.bat +++ b/tools/wheels/build-wheels.bat @@ -25,7 +25,7 @@ set CIBW_REPAIR_WHEEL_COMMAND=python -m delvewheel repair --add-path %DLL_DIR% - set PATH=%PATH%;c:\Program Files\Git\bin\ -python -m cibuildwheel --output-dir %WHEELHOUSE% --platform windows || goto :error +python3 -m cibuildwheel --output-dir %WHEELHOUSE% --platform windows || goto :error goto :eof From 35217e22eb0d68339be1649d79439709c42d662b Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Mon, 13 Mar 2023 20:24:00 +0530 Subject: [PATCH 58/62] pacman python update --- tools/mingw-w64/semaphore_commands.sh | 4 ++-- tools/wheels/build-wheels.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/mingw-w64/semaphore_commands.sh b/tools/mingw-w64/semaphore_commands.sh index dfe30d199..e1a4b74c1 100644 --- a/tools/mingw-w64/semaphore_commands.sh +++ b/tools/mingw-w64/semaphore_commands.sh @@ -1,5 +1,5 @@ #!/bin/bash -pacman -S python --version 3.8.0 +pacman -S mingw-w64-x86_64-python38 set -e @@ -8,4 +8,4 @@ export MAKE=mingw32-make # so that Autotools can find it cmd /c mklink /D C:\Python38\python3.exe C:\Python38\python.exe -python3 -m pip install cibuildwheel==2.12.0 +python -m pip install cibuildwheel==2.12.0 diff --git a/tools/wheels/build-wheels.sh b/tools/wheels/build-wheels.sh index ee42d9682..162b67fca 100755 --- a/tools/wheels/build-wheels.sh +++ b/tools/wheels/build-wheels.sh @@ -54,7 +54,7 @@ $this_dir/install-librdkafka.sh $librdkafka_version dest install_pkgs=cibuildwheel==$cibuildwheel_version -python3 -m pip install ${PIP_INSTALL_OPTS} $install_pkgs || +python -m pip install ${PIP_INSTALL_OPTS} $install_pkgs || pip3 install ${PIP_INSTALL_OPTS} $install_pkgs if [[ -z $TRAVIS ]]; then From 5bc9e01812f74cf768a32722a93a4b7e0ae48b6b Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Mon, 13 Mar 2023 20:52:21 +0530 Subject: [PATCH 59/62] pacman python update --- tools/mingw-w64/semaphore_commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/mingw-w64/semaphore_commands.sh b/tools/mingw-w64/semaphore_commands.sh index e1a4b74c1..1c93901fb 100644 --- a/tools/mingw-w64/semaphore_commands.sh +++ b/tools/mingw-w64/semaphore_commands.sh @@ -1,5 +1,5 @@ #!/bin/bash -pacman -S mingw-w64-x86_64-python38 +$msys2 pacman -S python --version 3.8.0 set -e From 3d4819c77d4f2fb47326f9e3058b25b613d30818 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Fri, 31 Mar 2023 17:40:29 +0530 Subject: [PATCH 60/62] packaging changes --- .semaphore/semaphore.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 8fd900860..029da677d 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -218,9 +218,10 @@ blocks: commands: - artifact pull workflow artifacts - cd artifacts - - tar cvf confluent-kafka-python-wheels-${SEMAPHORE_GIT_TAG_NAME}-${SEMAPHORE_WORKFLOW_ID}.tar . + - tar xvf *.tgz + - tar cvf confluent-kafka-python-wheels-${SEMAPHORE_GIT_TAG_NAME}-${SEMAPHORE_WORKFLOW_ID}.tgz wheelhouse/ - ls -la - - sha256sum * + - sha256sum confluent-kafka-python-wheels-${SEMAPHORE_GIT_TAG_NAME}-${SEMAPHORE_WORKFLOW_ID}.tgz - cd .. - - artifact push project artifacts --destination confluent-kafka-python-wheels-${SEMAPHORE_GIT_TAG_NAME}-${SEMAPHORE_WORKFLOW_ID} + - artifact push project artifacts/confluent-kafka-python-wheels-${SEMAPHORE_GIT_TAG_NAME}-${SEMAPHORE_WORKFLOW_ID}.tgz --destination confluent-kafka-python-wheels-${SEMAPHORE_GIT_TAG_NAME}-${SEMAPHORE_WORKFLOW_ID}.tgz - echo Thank you From 4843f613cd4ea6eef3a70e3fa2fbb9ec607c23ce Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Fri, 31 Mar 2023 18:21:14 +0530 Subject: [PATCH 61/62] packaging changes --- .semaphore/semaphore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 029da677d..71ee7b7c1 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -218,7 +218,7 @@ blocks: commands: - artifact pull workflow artifacts - cd artifacts - - tar xvf *.tgz + - ls *.gz |xargs -n1 tar -xvf - tar cvf confluent-kafka-python-wheels-${SEMAPHORE_GIT_TAG_NAME}-${SEMAPHORE_WORKFLOW_ID}.tgz wheelhouse/ - ls -la - sha256sum confluent-kafka-python-wheels-${SEMAPHORE_GIT_TAG_NAME}-${SEMAPHORE_WORKFLOW_ID}.tgz From 387992f7f18940f47b84ac9c7f81ca2a0553c835 Mon Sep 17 00:00:00 2001 From: PrasanthV454 Date: Fri, 31 Mar 2023 18:41:54 +0530 Subject: [PATCH 62/62] packaging changes --- .semaphore/semaphore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 71ee7b7c1..4d118760f 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -218,7 +218,7 @@ blocks: commands: - artifact pull workflow artifacts - cd artifacts - - ls *.gz |xargs -n1 tar -xvf + - ls *.tgz |xargs -n1 tar -xvf - tar cvf confluent-kafka-python-wheels-${SEMAPHORE_GIT_TAG_NAME}-${SEMAPHORE_WORKFLOW_ID}.tgz wheelhouse/ - ls -la - sha256sum confluent-kafka-python-wheels-${SEMAPHORE_GIT_TAG_NAME}-${SEMAPHORE_WORKFLOW_ID}.tgz