Skip to content

Commit 1c56eee

Browse files
henryborchershenryborchers
committed
ci: update nasm version used in windows builds
1 parent aa2be46 commit 1c56eee

File tree

25 files changed

+75
-55
lines changed

25 files changed

+75
-55
lines changed

‎Jenkinsfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ def windows_wheels(pythonVersions, testPackages, params){
271271
checkout scm
272272
try{
273273
lock("docker build-${env.NODE_NAME}"){
274-
dockerImage = docker.build(dockerImageName, '-f ci/docker/python/windows/tox/Dockerfile --build-arg PIP_EXTRA_INDEX_URL --build-arg PIP_INDEX_URL --build-arg CHOCOLATEY_SOURCE --build-arg chocolateyVersion --build-arg PIP_DOWNLOAD_CACHE=c:/users/ContainerUser/appdata/local/pip --build-arg UV_INDEX_URL --build-arg UV_EXTRA_INDEX_URL --build-arg UV_CACHE_DIR=c:/users/ContainerUser/appdata/local/uv' + (env.DEFAULT_DOCKER_DOTNET_SDK_BASE_IMAGE ? " --build-arg FROM_IMAGE=${env.DEFAULT_DOCKER_DOTNET_SDK_BASE_IMAGE} ": ' ') + ' .')
274+
dockerImage = docker.build(dockerImageName, '-f ci/docker/windows/tox/Dockerfile --build-arg PIP_EXTRA_INDEX_URL --build-arg PIP_INDEX_URL --build-arg CHOCOLATEY_SOURCE --build-arg chocolateyVersion --build-arg PIP_DOWNLOAD_CACHE=c:/users/ContainerUser/appdata/local/pip --build-arg UV_INDEX_URL --build-arg UV_EXTRA_INDEX_URL --build-arg UV_CACHE_DIR=c:/users/ContainerUser/appdata/local/uv' + (env.DEFAULT_DOCKER_DOTNET_SDK_BASE_IMAGE ? " --build-arg FROM_IMAGE=${env.DEFAULT_DOCKER_DOTNET_SDK_BASE_IMAGE} ": ' ') + ' .')
275275
}
276276
dockerImage.inside('--mount source=uv_python_install_dir,target=C:\\Users\\ContainerUser\\Documents\\uvpython'){
277277
withEnv(["UV_PYTHON=${pythonVersion}"]){
@@ -376,7 +376,7 @@ def linux_wheels(pythonVersions, testPackages, params){
376376
agent: [
377377
dockerfile: [
378378
label: "linux && docker && ${arch}",
379-
filename: 'ci/docker/python/linux/package/Dockerfile',
379+
filename: 'ci/docker/python/package/Dockerfile',
380380
additionalBuildArgs: "--build-arg PIP_EXTRA_INDEX_URL --build-arg PIP_INDEX_URL --build-arg UV_INDEX_URL --build-arg UV_EXTRA_INDEX_URL --build-arg manylinux_image=${arch=='x86_64'? 'quay.io/pypa/manylinux2014_x86_64': 'quay.io/pypa/manylinux2014_aarch64'} --build-arg UV_CACHE_DIR=/.cache/uv",
381381
args: '--mount source=python-package-tmp-uiucpreson-imagevalidate,target=/tmp',
382382
]
@@ -553,7 +553,7 @@ pipeline {
553553
stage('Build and Testing'){
554554
agent {
555555
dockerfile {
556-
filename 'ci/docker/python/linux/jenkins/Dockerfile'
556+
filename 'ci/docker/linux/jenkins/Dockerfile'
557557
label 'linux && docker && x86_64'
558558
additionalBuildArgs '--build-arg PIP_EXTRA_INDEX_URL --build-arg UV_EXTRA_INDEX_URL'
559559
args '--mount source=sonar-cache-uiucprescon-imagevalidate,target=/opt/sonar/.sonar/cache'
@@ -996,7 +996,7 @@ pipeline {
996996
def image
997997
retry(3){
998998
lock("${env.JOB_NAME} - ${env.NODE_NAME}"){
999-
image = docker.build(UUID.randomUUID().toString(), '-f ci/docker/python/linux/tox/Dockerfile --build-arg PIP_EXTRA_INDEX_URL --build-arg PIP_INDEX_URL --build-arg UV_EXTRA_INDEX_URL --build-arg UV_INDEX_URL --build-arg PIP_DOWNLOAD_CACHE=/.cache/pip --build-arg UV_CACHE_DIR=/.cache/uv .')
999+
image = docker.build(UUID.randomUUID().toString(), '-f ci/docker/python/tox/Dockerfile --build-arg PIP_EXTRA_INDEX_URL --build-arg PIP_INDEX_URL --build-arg UV_EXTRA_INDEX_URL --build-arg UV_INDEX_URL --build-arg PIP_DOWNLOAD_CACHE=/.cache/pip --build-arg UV_CACHE_DIR=/.cache/uv .')
10001000
}
10011001
try{
10021002
image.inside('--mount source=python-tox-tmp-uiucpreson-imagevalidate,target=/tmp'){
@@ -1080,7 +1080,7 @@ pipeline {
10801080
def image
10811081
checkout scm
10821082
lock("${env.JOB_NAME} - ${env.NODE_NAME}"){
1083-
image = docker.build(UUID.randomUUID().toString(), '-f ci/docker/python/windows/tox/Dockerfile --build-arg PIP_EXTRA_INDEX_URL --build-arg PIP_INDEX_URL --build-arg CHOCOLATEY_SOURCE --build-arg chocolateyVersion --build-arg PIP_DOWNLOAD_CACHE=c:/users/ContainerUser/appdata/local/pip --build-arg UV_INDEX_URL --build-arg UV_EXTRA_INDEX_URL --build-arg UV_CACHE_DIR=c:/users/ContainerUser/appdata/local/uv' + (env.DEFAULT_DOCKER_DOTNET_SDK_BASE_IMAGE ? " --build-arg FROM_IMAGE=${env.DEFAULT_DOCKER_DOTNET_SDK_BASE_IMAGE} ": ' ') + '.')
1083+
image = docker.build(UUID.randomUUID().toString(), '-f ci/docker/windows/tox/Dockerfile --build-arg PIP_EXTRA_INDEX_URL --build-arg PIP_INDEX_URL --build-arg CHOCOLATEY_SOURCE --build-arg chocolateyVersion --build-arg PIP_DOWNLOAD_CACHE=c:/users/ContainerUser/appdata/local/pip --build-arg UV_INDEX_URL --build-arg UV_EXTRA_INDEX_URL --build-arg UV_CACHE_DIR=c:/users/ContainerUser/appdata/local/uv' + (env.DEFAULT_DOCKER_DOTNET_SDK_BASE_IMAGE ? " --build-arg FROM_IMAGE=${env.DEFAULT_DOCKER_DOTNET_SDK_BASE_IMAGE} ": ' ') + '.')
10841084
}
10851085
try{
10861086
image.inside("--mount source=uv_python_install_dir,target=${env.UV_PYTHON_INSTALL_DIR}"){
@@ -1282,7 +1282,7 @@ pipeline {
12821282
def dockerImageName = "${currentBuild.fullProjectName}_${UUID.randomUUID().toString()}".replaceAll("-", "_").replaceAll('/', "_").replaceAll(' ', "").toLowerCase()
12831283
checkout scm
12841284
lock("docker build-${env.NODE_NAME}"){
1285-
dockerImage = docker.build(dockerImageName, '-f ci/docker/python/windows/tox/Dockerfile --build-arg PIP_EXTRA_INDEX_URL --build-arg PIP_INDEX_URL --build-arg CHOCOLATEY_SOURCE --build-arg chocolateyVersion --build-arg PIP_DOWNLOAD_CACHE=c:/users/ContainerUser/appdata/local/pip --build-arg UV_INDEX_URL --build-arg UV_EXTRA_INDEX_URL --build-arg UV_CACHE_DIR=c:/users/ContainerUser/appdata/local/uv' + (env.DEFAULT_DOCKER_DOTNET_SDK_BASE_IMAGE ? " --build-arg FROM_IMAGE=${env.DEFAULT_DOCKER_DOTNET_SDK_BASE_IMAGE} ": ' ') + '.')
1285+
dockerImage = docker.build(dockerImageName, '-f ci/docker/windows/tox/Dockerfile --build-arg PIP_EXTRA_INDEX_URL --build-arg PIP_INDEX_URL --build-arg CHOCOLATEY_SOURCE --build-arg chocolateyVersion --build-arg PIP_DOWNLOAD_CACHE=c:/users/ContainerUser/appdata/local/pip --build-arg UV_INDEX_URL --build-arg UV_EXTRA_INDEX_URL --build-arg UV_CACHE_DIR=c:/users/ContainerUser/appdata/local/uv' + (env.DEFAULT_DOCKER_DOTNET_SDK_BASE_IMAGE ? " --build-arg FROM_IMAGE=${env.DEFAULT_DOCKER_DOTNET_SDK_BASE_IMAGE} ": ' ') + '.')
12861286
}
12871287
dockerImage.inside('--mount type=volume,source=uv_python_install_dir,target=C:\\Users\\ContainerUser\\Documents\\uvpython'){
12881288
unstash 'python sdist'
@@ -1334,7 +1334,7 @@ pipeline {
13341334
agent: [
13351335
dockerfile: [
13361336
label: "linux && docker && ${arch}",
1337-
filename: 'ci/docker/python/linux/tox/Dockerfile',
1337+
filename: 'ci/docker/linux/tox/Dockerfile',
13381338
additionalBuildArgs: '--build-arg PIP_EXTRA_INDEX_URL --build-arg PIP_INDEX_URL --build-arg UV_INDEX_URL --build-arg UV_EXTRA_INDEX_URL --build-arg PIP_DOWNLOAD_CACHE=/.cache/pip --build-arg UV_CACHE_DIR=/.cache/uv'
13391339
]
13401340
],
@@ -1484,7 +1484,7 @@ pipeline {
14841484

14851485
agent {
14861486
dockerfile {
1487-
filename 'ci/docker/python/linux/jenkins/Dockerfile'
1487+
filename 'ci/docker/linux/jenkins/Dockerfile'
14881488
label 'linux && docker'
14891489
additionalBuildArgs '--build-arg PIP_EXTRA_INDEX_URL'
14901490
}

ci/docker/python/linux/jenkins/Dockerfile renamed to ci/docker/linux/jenkins/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ ARG PIP_INDEX_URL
5656
ARG UV_EXTRA_INDEX_URL
5757
ARG UV_INDEX_URL
5858

59-
COPY ci/docker/python/linux/jenkins/conan/profile.ini ${CONAN_USER_HOME}/.conan/profiles/default
59+
COPY ci/docker/linux/jenkins/conan/profile.ini ${CONAN_USER_HOME}/.conan/profiles/default
6060
COPY conanfile.py /tmp/conanfile.py
6161
COPY ci/docker/python/linux/shared/ensure_compiler_support_by_conan.py /tmp/ensure_compiler_support_by_conan.py
6262
COPY requirements-dev.txt /tmp/requirements-dev.txt

ci/docker/python/linux/jenkins/conan/profile.ini renamed to ci/docker/linux/jenkins/conan/profile.ini

File renamed without changes.

ci/docker/python/linux/package/Dockerfile renamed to ci/docker/linux/package/Dockerfile

File renamed without changes.

ci/docker/python/linux/package/conan/amd64/profile.ini renamed to ci/docker/linux/package/conan/amd64/profile.ini

File renamed without changes.

ci/docker/python/linux/package/conan/arm64/profile.ini renamed to ci/docker/linux/package/conan/arm64/profile.ini

File renamed without changes.

ci/docker/python/linux/shared/ensure_compiler_support_by_conan.py renamed to ci/docker/linux/shared/ensure_compiler_support_by_conan.py

File renamed without changes.

ci/docker/python/linux/tox/Dockerfile renamed to ci/docker/linux/tox/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARG PIP_DOWNLOAD_CACHE=/.cache/pip
44
ARG UV_CACHE_DIR=/.cache/uv
55
ARG UV_EXTRA_INDEX_URL
66
FROM ubuntu:22.04 AS wheel_builder_base
7-
COPY ci/docker/python/linux/tox/apt-packages.txt /tmp/apt-packages.txt
7+
COPY ci/docker/linux/tox/apt-packages.txt /tmp/apt-packages.txt
88
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
99
RUN rm -f /etc/apt/apt.conf.d/docker-clean
1010
RUN --mount=type=cache,target=/var/cache/apt \
@@ -26,7 +26,7 @@ ARG PIP_EXTRA_INDEX_URL
2626
ARG PIP_INDEX_URL
2727
ARG UV_EXTRA_INDEX_URL
2828
ARG UV_INDEX_URL
29-
COPY ci/docker/python/linux/shared/ensure_compiler_support_by_conan.py /tmp/ensure_compiler_support_by_conan.py
29+
COPY ci/docker/linux/shared/ensure_compiler_support_by_conan.py /tmp/ensure_compiler_support_by_conan.py
3030
COPY conanfile.py /tmp/conanfile.py
3131
RUN python3 -m venv venv && \
3232
venv/bin/pip install --no-cache --disable-pip-version-check uv && \

ci/docker/python/linux/tox/apt-packages.txt renamed to ci/docker/linux/tox/apt-packages.txt

File renamed without changes.

ci/docker/python/linux/tox/conan/profile.ini renamed to ci/docker/linux/tox/conan/profile.ini

File renamed without changes.

0 commit comments

Comments
 (0)