Skip to content

Commit 24c7314

Browse files
committed
Fix tests and debug windows build
1 parent 76d17fe commit 24c7314

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

.github/workflows/build-native-action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ jobs:
245245
env:
246246
RELENV_NATIVE_PY_VERSION: 3.10.12
247247
run: |
248-
python -m relenv build --arch=${{ matrix.arch }} --python=${{ matrix.version }}
248+
python -m relenv build --no-pretty --arch=${{ matrix.arch }} --python=${{ matrix.version }}
249249
250250
- name: Verify Build
251251
if: ${{ matrix.arch == 'amd64' }}

tests/test_verify_build.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ def test_pip_install_salt_git(pipexec, build, build_dir, pyexec, build_version):
9797
pytest.xfail("Salt does not work with 3.11 or 3.12 on windows yet")
9898
if sys.platform == "darwin" and "3.12" in build_version:
9999
pytest.xfail("Salt does not work with 3.12 on macos yet")
100-
# if "3.13" in build_version:
101-
# pytest.xfail("Salt does not work with 3.13 yet")
100+
if sys.platform == "darwin" and "3.13" in build_version:
101+
pytest.xfail("Salt does not work with 3.13 on macos yet")
102102

103103
env = os.environ.copy()
104104
env["RELENV_BUILDENV"] = "yes"
@@ -341,8 +341,12 @@ def test_pip_install_pyzmq(pipexec, pyzmq_version, build_version, arch):
341341
if sys.platform == "win32" and pyzmq_version == "23.2.0":
342342
pytest.xfail("vcredist not found as of 9/9/24")
343343

344+
if sys.platform == "win32" and pyzmq_version == "26.2.0":
345+
pytest.xfail("vcredist not found as of 9/9/24")
346+
344347
if pyzmq_version == "23.2.0" and "3.13" in build_version:
345348
pytest.xfail(f"{pyzmq_version} does not install on 3.13")
349+
346350
if pyzmq_version == "25.1.2" and "3.13" in build_version:
347351
pytest.xfail(f"{pyzmq_version} does not install on 3.13")
348352

@@ -413,6 +417,9 @@ def test_pip_install_salt_pip_dir(pipexec, build, build_version, arch):
413417
if sys.platform == "win32" and arch == "amd64":
414418
pytest.xfail("Known failure on windows amd64")
415419

420+
if sys.platform == "darwin" and "3.13" in build_version:
421+
pytest.xfail("Salt does not work with 3.13 on macos yet")
422+
416423
env = os.environ.copy()
417424
env["RELENV_BUILDENV"] = "yes"
418425
env["RELENV_DEBUG"] = "yes"

0 commit comments

Comments
 (0)