Skip to content

Commit 6609c49

Browse files
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # .github/workflows/tox_matrix.yml # .github/workflows/wheels.yml # Jenkinsfile # pyproject.toml # scripts/resources/windows/Dockerfile # scripts/resources/windows/msvc/visual_studio_config.json
2 parents bf494ac + 094888e commit 6609c49

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

Jenkinsfile

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -846,13 +846,15 @@ pipeline {
846846
node('docker && linux'){
847847
try{
848848
checkout scm
849-
docker.image('python').inside{
850-
sh(script: 'python3 -m venv venv && venv/bin/pip install --disable-pip-version-check uv')
851-
envs = sh(
852-
label: 'Get tox environments',
853-
script: './venv/bin/uv run --quiet --only-group tox --with tox-uv --isolated tox list -d --no-desc',
854-
returnStdout: true,
855-
).trim().split('\n')
849+
timeout(10){
850+
docker.image('python').inside{
851+
sh(script: 'python3 -m venv venv && venv/bin/pip install --disable-pip-version-check uv')
852+
envs = sh(
853+
label: 'Get tox environments',
854+
script: './venv/bin/uv run --quiet --only-group tox --with tox-uv --isolated tox list -d --no-desc',
855+
returnStdout: true,
856+
).trim().split('\n')
857+
}
856858
}
857859
} finally{
858860
sh "${tool(name: 'Default', type: 'git')} clean -dfx"

scripts/resources/windows/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ RUN Set-ExecutionPolicy Bypass -Scope Process -Force; `
6262
RUN New-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem" `
6363
-Name "LongPathsEnabled" -Value 1 -PropertyType DWORD -Force
6464

65-
FROM chocolatey_base AS CONAN_BUILDER
6665
FROM chocolatey_base AS conan_builder
6766
ARG CONAN_HOME
6867

0 commit comments

Comments
 (0)