Skip to content

Commit f21d16d

Browse files
BartoszBlizniakBartoszBlizniak
committed
run on smaller scale
1 parent 16b42e4 commit f21d16d

8 files changed

Lines changed: 409 additions & 116 deletions

‎.github/.platforms/linux-aarch64-musl-py310.json‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"marker_environment": {
3+
"implementation_name": "cpython",
4+
"implementation_version": "3.10.19",
5+
"os_name": "posix",
6+
"platform_machine": "aarch64",
7+
"platform_python_implementation": "CPython",
8+
"platform_release": "6.1.0",
9+
"platform_system": "Linux",
10+
"platform_version": "#1 SMP",
11+
"python_full_version": "3.10.19",
12+
"python_version": "3.10",
13+
"sys_platform": "linux"
14+
},
15+
"compatible_tags": [
16+
"cp310-cp310-musllinux_1_2_aarch64",
17+
"cp310-cp310-musllinux_1_1_aarch64",
18+
"cp310-cp310-linux_aarch64",
19+
"cp310-abi3-musllinux_1_2_aarch64",
20+
"cp310-abi3-musllinux_1_1_aarch64",
21+
"cp310-abi3-linux_aarch64",
22+
"cp310-none-musllinux_1_2_aarch64",
23+
"cp310-none-musllinux_1_1_aarch64",
24+
"cp310-none-linux_aarch64",
25+
"cp39-abi3-musllinux_1_2_aarch64",
26+
"cp39-abi3-musllinux_1_1_aarch64",
27+
"cp39-abi3-linux_aarch64",
28+
"cp38-abi3-musllinux_1_2_aarch64",
29+
"cp38-abi3-musllinux_1_1_aarch64",
30+
"cp38-abi3-linux_aarch64",
31+
"cp37-abi3-musllinux_1_2_aarch64",
32+
"cp37-abi3-musllinux_1_1_aarch64",
33+
"cp37-abi3-linux_aarch64",
34+
"py310-none-musllinux_1_2_aarch64",
35+
"py310-none-musllinux_1_1_aarch64",
36+
"py310-none-linux_aarch64",
37+
"py3-none-musllinux_1_2_aarch64",
38+
"py3-none-musllinux_1_1_aarch64",
39+
"py3-none-linux_aarch64",
40+
"cp310-none-any",
41+
"py310-none-any",
42+
"py3-none-any"
43+
]
44+
}

‎.github/.platforms/linux-aarch64-py310.json‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"marker_environment": {
3+
"implementation_name": "cpython",
4+
"implementation_version": "3.10.19",
5+
"os_name": "posix",
6+
"platform_machine": "aarch64",
7+
"platform_python_implementation": "CPython",
8+
"platform_release": "6.1.0",
9+
"platform_system": "Linux",
10+
"platform_version": "#1 SMP",
11+
"python_full_version": "3.10.19",
12+
"python_version": "3.10",
13+
"sys_platform": "linux"
14+
},
15+
"compatible_tags": [
16+
"cp310-cp310-manylinux_2_17_aarch64",
17+
"cp310-cp310-manylinux2014_aarch64",
18+
"cp310-cp310-linux_aarch64",
19+
"cp310-abi3-manylinux_2_17_aarch64",
20+
"cp310-abi3-manylinux2014_aarch64",
21+
"cp310-abi3-linux_aarch64",
22+
"cp310-none-manylinux_2_17_aarch64",
23+
"cp310-none-manylinux2014_aarch64",
24+
"cp310-none-linux_aarch64",
25+
"cp39-abi3-manylinux_2_17_aarch64",
26+
"cp39-abi3-manylinux2014_aarch64",
27+
"cp39-abi3-linux_aarch64",
28+
"cp38-abi3-manylinux_2_17_aarch64",
29+
"cp38-abi3-manylinux2014_aarch64",
30+
"cp38-abi3-linux_aarch64",
31+
"cp37-abi3-manylinux_2_17_aarch64",
32+
"cp37-abi3-manylinux2014_aarch64",
33+
"cp37-abi3-linux_aarch64",
34+
"py310-none-manylinux_2_17_aarch64",
35+
"py310-none-manylinux2014_aarch64",
36+
"py310-none-linux_aarch64",
37+
"py3-none-manylinux_2_17_aarch64",
38+
"py3-none-manylinux2014_aarch64",
39+
"py3-none-linux_aarch64",
40+
"cp310-none-any",
41+
"py310-none-any",
42+
"py3-none-any"
43+
]
44+
}

‎.github/.platforms/linux-x86_64-musl-py310.json‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"marker_environment": {
3+
"implementation_name": "cpython",
4+
"implementation_version": "3.10.19",
5+
"os_name": "posix",
6+
"platform_machine": "x86_64",
7+
"platform_python_implementation": "CPython",
8+
"platform_release": "6.1.0",
9+
"platform_system": "Linux",
10+
"platform_version": "#1 SMP",
11+
"python_full_version": "3.10.19",
12+
"python_version": "3.10",
13+
"sys_platform": "linux"
14+
},
15+
"compatible_tags": [
16+
"cp310-cp310-musllinux_1_2_x86_64",
17+
"cp310-cp310-musllinux_1_1_x86_64",
18+
"cp310-cp310-linux_x86_64",
19+
"cp310-abi3-musllinux_1_2_x86_64",
20+
"cp310-abi3-musllinux_1_1_x86_64",
21+
"cp310-abi3-linux_x86_64",
22+
"cp310-none-musllinux_1_2_x86_64",
23+
"cp310-none-musllinux_1_1_x86_64",
24+
"cp310-none-linux_x86_64",
25+
"cp39-abi3-musllinux_1_2_x86_64",
26+
"cp39-abi3-musllinux_1_1_x86_64",
27+
"cp39-abi3-linux_x86_64",
28+
"cp38-abi3-musllinux_1_2_x86_64",
29+
"cp38-abi3-musllinux_1_1_x86_64",
30+
"cp38-abi3-linux_x86_64",
31+
"cp37-abi3-musllinux_1_2_x86_64",
32+
"cp37-abi3-musllinux_1_1_x86_64",
33+
"cp37-abi3-linux_x86_64",
34+
"py310-none-musllinux_1_2_x86_64",
35+
"py310-none-musllinux_1_1_x86_64",
36+
"py310-none-linux_x86_64",
37+
"py3-none-musllinux_1_2_x86_64",
38+
"py3-none-musllinux_1_1_x86_64",
39+
"py3-none-linux_x86_64",
40+
"cp310-none-any",
41+
"py310-none-any",
42+
"py3-none-any"
43+
]
44+
}

‎.github/.platforms/linux-x86_64-py310.json‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"marker_environment": {
3+
"implementation_name": "cpython",
4+
"implementation_version": "3.10.19",
5+
"os_name": "posix",
6+
"platform_machine": "x86_64",
7+
"platform_python_implementation": "CPython",
8+
"platform_release": "6.1.0",
9+
"platform_system": "Linux",
10+
"platform_version": "#1 SMP",
11+
"python_full_version": "3.10.19",
12+
"python_version": "3.10",
13+
"sys_platform": "linux"
14+
},
15+
"compatible_tags": [
16+
"cp310-cp310-manylinux_2_17_x86_64",
17+
"cp310-cp310-manylinux2014_x86_64",
18+
"cp310-cp310-linux_x86_64",
19+
"cp310-abi3-manylinux_2_17_x86_64",
20+
"cp310-abi3-manylinux2014_x86_64",
21+
"cp310-abi3-linux_x86_64",
22+
"cp310-none-manylinux_2_17_x86_64",
23+
"cp310-none-manylinux2014_x86_64",
24+
"cp310-none-linux_x86_64",
25+
"cp39-abi3-manylinux_2_17_x86_64",
26+
"cp39-abi3-manylinux2014_x86_64",
27+
"cp39-abi3-linux_x86_64",
28+
"cp38-abi3-manylinux_2_17_x86_64",
29+
"cp38-abi3-manylinux2014_x86_64",
30+
"cp38-abi3-linux_x86_64",
31+
"cp37-abi3-manylinux_2_17_x86_64",
32+
"cp37-abi3-manylinux2014_x86_64",
33+
"cp37-abi3-linux_x86_64",
34+
"py310-none-manylinux_2_17_x86_64",
35+
"py310-none-manylinux2014_x86_64",
36+
"py310-none-linux_x86_64",
37+
"py3-none-manylinux_2_17_x86_64",
38+
"py3-none-manylinux2014_x86_64",
39+
"py3-none-linux_x86_64",
40+
"cp310-none-any",
41+
"py310-none-any",
42+
"py3-none-any"
43+
]
44+
}

‎.github/.platforms/macos-arm64-py310.json‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"marker_environment": {
3+
"implementation_name": "cpython",
4+
"implementation_version": "3.10.18",
5+
"os_name": "posix",
6+
"platform_machine": "arm64",
7+
"platform_python_implementation": "CPython",
8+
"platform_release": "23.0.0",
9+
"platform_system": "Darwin",
10+
"platform_version": "Darwin Kernel Version 23.0.0",
11+
"python_full_version": "3.10.18",
12+
"python_version": "3.10",
13+
"sys_platform": "darwin"
14+
},
15+
"compatible_tags": [
16+
"cp310-cp310-macosx_11_0_arm64",
17+
"cp310-cp310-macosx_11_0_universal2",
18+
"cp310-abi3-macosx_11_0_arm64",
19+
"cp310-abi3-macosx_11_0_universal2",
20+
"cp310-none-macosx_11_0_arm64",
21+
"cp310-none-macosx_11_0_universal2",
22+
"cp39-abi3-macosx_11_0_arm64",
23+
"cp39-abi3-macosx_11_0_universal2",
24+
"cp38-abi3-macosx_11_0_arm64",
25+
"cp38-abi3-macosx_11_0_universal2",
26+
"cp37-abi3-macosx_11_0_arm64",
27+
"cp37-abi3-macosx_11_0_universal2",
28+
"py310-none-macosx_11_0_arm64",
29+
"py310-none-macosx_11_0_universal2",
30+
"py3-none-macosx_11_0_arm64",
31+
"py3-none-macosx_11_0_universal2",
32+
"cp310-none-any",
33+
"py310-none-any",
34+
"py3-none-any"
35+
]
36+
}

‎.github/.platforms/windows-x86_64-py310.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"marker_environment": {
3+
"implementation_name": "cpython",
4+
"implementation_version": "3.10.11",
5+
"os_name": "nt",
6+
"platform_machine": "AMD64",
7+
"platform_python_implementation": "CPython",
8+
"platform_release": "10",
9+
"platform_system": "Windows",
10+
"platform_version": "10.0.19045",
11+
"python_full_version": "3.10.11",
12+
"python_version": "3.10",
13+
"sys_platform": "win32"
14+
},
15+
"compatible_tags": [
16+
"cp310-cp310-win_amd64",
17+
"cp310-abi3-win_amd64",
18+
"cp310-none-win_amd64",
19+
"cp39-abi3-win_amd64",
20+
"cp38-abi3-win_amd64",
21+
"cp37-abi3-win_amd64",
22+
"py310-none-win_amd64",
23+
"py3-none-win_amd64",
24+
"cp310-none-any",
25+
"py310-none-any",
26+
"py3-none-any"
27+
]
28+
}

‎.github/workflows/release.yml‎

Lines changed: 36 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -22,30 +22,29 @@ jobs:
2222
with:
2323
python-version: '3.10'
2424
cache: 'pip'
25-
- name: Cache PEX dependencies
26-
uses: actions/cache@v4
27-
with:
28-
path: ~/.pex
29-
key: pex-${{ runner.os }}-${{ hashFiles('setup.py', 'requirements.txt') }}
30-
restore-keys: |
31-
pex-${{ runner.os }}-
32-
- name: Install dependencies
25+
26+
- name: Install build dependencies
3327
run: |
3428
python -m pip install --upgrade pip
35-
pip install pex
29+
pip install pex setuptools wheel
3630
3731
- name: Get version
3832
id: get_version
3933
run: echo "VERSION=$(cat cloudsmith_cli/data/VERSION)" >> $GITHUB_ENV
4034

41-
- name: Create Zipapp
35+
- name: Create multi-platform Zipapp with PEX
4236
run: |
43-
pex . \
44-
-o cloudsmith-${{ env.VERSION }}.pyz \
45-
--console-script cloudsmith \
46-
--python-shebang "/usr/bin/env python3" \
47-
--venv \
48-
--interpreter-constraint "CPython>=3.10,<3.15"
37+
pex . \
38+
--output-file cloudsmith-${{ env.VERSION }}.pyz \
39+
--console-script cloudsmith \
40+
--python-shebang "/usr/bin/env python3" \
41+
--venv \
42+
--complete-platform .github/.platforms/linux-x86_64-py310.json \
43+
--complete-platform .github/.platforms/linux-aarch64-py310.json \
44+
--complete-platform .github/.platforms/linux-x86_64-musl-py310.json \
45+
--complete-platform .github/.platforms/linux-aarch64-musl-py310.json \
46+
--complete-platform .github/.platforms/macos-arm64-py310.json \
47+
--complete-platform .github/.platforms/windows-x86_64-py310.json
4948
5049
- name: Create Release
5150
id: create_release
@@ -79,9 +78,6 @@ jobs:
7978
id: push_zipapp
8079
run: cloudsmith push raw ${{ vars.CLOUDSMITH_NAMESPACE }}/cli-zipapp ./cloudsmith-${{ env.VERSION }}.pyz --name cloudsmith-cli --version ${{ env.VERSION }}
8180

82-
- name: Install build dependencies for Python packages
83-
run: pip install setuptools wheel
84-
8581
- name: Build Python packages
8682
run: python setup.py sdist bdist_wheel
8783

@@ -91,24 +87,31 @@ jobs:
9187
- name: Push wheel to Cloudsmith
9288
run: cloudsmith push python ${{ vars.CLOUDSMITH_NAMESPACE }}/cli dist/cloudsmith_cli-${{ env.VERSION }}-py3-none-any.whl
9389

90+
- name: Set up QEMU for multi-arch
91+
uses: docker/setup-qemu-action@v3
92+
9493
- name: Set up Docker Buildx
9594
uses: docker/setup-buildx-action@v3
9695

97-
- name: Login to Cloudsmith Docker Registry
98-
run: echo "${CLOUDSMITH_API_KEY}" | docker login docker.cloudsmith.io -u ${{ vars.CLOUDSMITH_SVC_SLUG }} --password-stdin
99-
100-
- name: Login to DockerHub
101-
run: echo "${{ secrets.DOCKERHUB_PAT }}" | docker login -u ${{ vars.DOCKERHUB_USER }} --password-stdin
102-
103-
- name: Build and push Docker images
96+
- name: Push Dockerised CLI to Cloudsmith (multi-arch)
97+
id: push_dockerised_cli_cloudsmith
98+
run: |
99+
echo "${CLOUDSMITH_API_KEY}" | docker login docker.cloudsmith.io -u ${{ vars.CLOUDSMITH_SVC_SLUG }} --password-stdin
100+
docker buildx build \
101+
--platform linux/amd64,linux/arm64 \
102+
--build-arg CLOUDSMITH_CLI_VERSION=${{ env.VERSION }} \
103+
-t docker.cloudsmith.io/${{ vars.CLOUDSMITH_NAMESPACE }}/cli-zipapp/cloudsmith-cli:${{ env.VERSION }} \
104+
--push .
105+
106+
- name: Push Dockerised CLI to DockerHub (multi-arch)
107+
id: push_dockerised_cli_dockerhub
104108
run: |
105-
docker buildx build \
106-
--platform linux/amd64,linux/arm64 \
107-
--build-arg CLOUDSMITH_CLI_VERSION=${{ env.VERSION }} \
108-
-t docker.cloudsmith.io/${{ vars.CLOUDSMITH_NAMESPACE }}/cli-zipapp/cloudsmith-cli:${{ env.VERSION }} \
109-
-t cloudsmith/cloudsmith-cli:${{ env.VERSION }} \
110-
--push \
111-
.
109+
echo "${{ secrets.DOCKERHUB_PAT }}" | docker login -u ${{ vars.DOCKERHUB_USER }} --password-stdin
110+
docker buildx build \
111+
--platform linux/amd64,linux/arm64 \
112+
--build-arg CLOUDSMITH_CLI_VERSION=${{ env.VERSION }} \
113+
-t cloudsmith/cloudsmith-cli:${{ env.VERSION }} \
114+
--push .
112115
113116
# Publish Python packages to PyPI
114117
publish-pypi:

0 commit comments

Comments
 (0)