Skip to content

Commit 0dd403a

Browse files
author
Francesco Faraone
committed
Fix build of linux on py3.10, exclude uvloop for nsis build
1 parent ae4e6bd commit 0dd403a

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

.github/workflows/publish.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Set up Python 3.10
1818
uses: actions/setup-python@v4
1919
with:
20-
python-version: 3.10
20+
python-version: '3.10'
2121
- name: Install dependencies
2222
run: |
2323
python -m pip install --upgrade pip
@@ -48,11 +48,11 @@ jobs:
4848
poetry version ${{ steps.tag.outputs.result }}
4949
poetry build
5050
if [ "$(curl -s -o /dev/null -w '%{http_code}' https://pypi.org/pypi/connect-cli/${{ steps.tag.outputs.result }}/json)" = "404" ]; then poetry publish -u $TWINE_USERNAME -p $TWINE_PASSWORD; fi
51-
- name: Set Connect and Runner major versions
51+
- name: Set Connect and CLI major versions
5252
id: cnctver
5353
run: |
5454
echo connect_major="$(curl -sI https://api.connect.cloudblue.com/public/v1|grep -Fi 'connect-version' | tr -d '\r' | sed -En 's/^Connect-Version: (.*)/\1/p'|cut -f1 -d'.')" >> $GITHUB_OUTPUT
55-
echo runner_major="$(echo ${{ steps.tag.outputs.result }}|cut -f1 -d '.')" >> $GITHUB_OUTPUT
55+
echo cli_major="$(echo ${{ steps.tag.outputs.result }}|cut -f1 -d '.')" >> $GITHUB_OUTPUT
5656
- name: Set up QEMU
5757
uses: docker/setup-qemu-action@v2
5858
with:
@@ -72,7 +72,7 @@ jobs:
7272
tags: |
7373
type=semver,pattern={{major}}.{{minor}},value=${{ steps.tag.outputs.result }}.0
7474
type=semver,pattern={{major}},value=${{ steps.tag.outputs.result }}.0
75-
type=raw,value=latest,enable=${{ steps.cnctver.outputs.connect_major == steps.cnctver.outputs.runner_major }}
75+
type=raw,value=latest,enable=${{ steps.cnctver.outputs.connect_major == steps.cnctver.outputs.cli_major }}
7676
flavor: |
7777
latest=false
7878
- name: Build and push docker image
@@ -97,7 +97,7 @@ jobs:
9797
- name: Set up Python 3.10
9898
uses: actions/setup-python@v4
9999
with:
100-
python-version: 3.10
100+
python-version: '3.10'
101101
- name: Install dependencies
102102
run: |
103103
python -m pip install --upgrade pip

resources/generate_pynsist_config.py

+4
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313

1414
RES_DIR = os.path.abspath(os.path.dirname(__file__))
1515

16+
EXCLUDED_PACKAGES = ['uvloop']
17+
1618

1719
@contextlib.contextmanager
1820
def build_dir(dir):
@@ -41,6 +43,8 @@ def get_wheels_and_sdists(): # noqa: CCR001
4143
else:
4244
package_with_ver = line.replace('\n', '')
4345
package, version = package_with_ver.split('==')
46+
if package in EXCLUDED_PACKAGES:
47+
continue
4448
pkg_info = get_package_info(package)
4549
required_version = pkg_info['releases'][version.strip()]
4650
sdist_url = None

0 commit comments

Comments
 (0)