Skip to content

Commit ac47cc8

Browse files
committed
Fixed wheels naming.
1 parent 6ea75b8 commit ac47cc8

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

.github/workflows/build_wheels_musllinux.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ jobs:
2727
matrix:
2828
python-version: ['3.12']
2929
platform: [x86_64, aarch64]
30-
manylinux: [2014, 2_28]
3130
with_contrib: [0, 1]
3231
build_sdist: [0]
3332
include:
@@ -41,7 +40,7 @@ jobs:
4140
PROJECT_SPEC: opencv-python
4241
MB_PYTHON_VERSION: ${{ matrix.python-version }}
4342
TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
44-
MB_ML_VER: _1_2
43+
MB_ML_VER: 1_2
4544
MB_ML_LIBC: musllinux
4645
TRAVIS_BUILD_DIR: ${{ github.workspace }}
4746
CONFIG_PATH: travis_config.sh
@@ -73,7 +72,7 @@ jobs:
7372
- name: Saving a wheel accordingly to matrix
7473
uses: actions/upload-artifact@v4
7574
with:
76-
name: wheel-${{ matrix.platform }}-${{ matrix.manylinux }}-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
75+
name: wheel-${{ matrix.platform }}-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
7776
path: wheelhouse/opencv*.whl
7877

7978
Test:
@@ -93,7 +92,7 @@ jobs:
9392
env:
9493
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
9594
MB_PYTHON_VERSION: ${{ matrix.python-version }}
96-
MB_ML_VER: _1_2
95+
MB_ML_VER: 1_2
9796
MB_ML_LIBC: musllinux
9897
NP_TEST_DEP: numpy==1.19.5
9998
NP_TEST_DEP_LATEST: numpy==2.2.6
@@ -117,7 +116,7 @@ jobs:
117116
- name: Download a wheel accordingly to matrix
118117
uses: actions/download-artifact@v4
119118
with:
120-
name: wheel-${{ matrix.platform }}-${{ matrix.manylinux }}-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
119+
name: wheel-${{ matrix.platform }}-${{ matrix.with_contrib }}-1-${{ matrix.build_sdist }}
121120
path: wheelhouse/
122121
- name: Package installation and run tests
123122
run: source scripts/install.sh

docker/musllinux_1_2/Dockerfile_x86_64

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,10 @@ RUN curl -O -L https://github.com/ccache/ccache/releases/download/v${CCACHE_VERS
149149

150150
# user`s UID is 1001
151151
RUN adduser -D -u 1001 ci && mkdir /io && chown ci:ci /io && \
152-
chown -R ci:ci /ffmpeg_build
152+
chown -R ci:ci /ffmpeg_build && \
153+
# This calls in mutlibuild scripts and cannot be run without permissions
154+
chown -R ci:ci /opt/_internal/pipx/venvs/auditwheel
155+
153156

154157
USER ci
155158

0 commit comments

Comments
 (0)