diff --git a/.ci/ci-check.py b/.ci/ci-check.py index 3c84a577fc..c0b2cf6b00 100644 --- a/.ci/ci-check.py +++ b/.ci/ci-check.py @@ -84,7 +84,7 @@ def install_package(pkg: typing.Union[typing.List[str], Path]) -> typing.Generat "--sync", "--noconfirm", "--needed", - "mingw-w64-x86_64-python-pip", + "mingw-w64-ucrt-x86_64-python-pip", get_pkg_name(pkg), ] uninstall_command = [ @@ -103,7 +103,7 @@ def install_package(pkg: typing.Union[typing.List[str], Path]) -> typing.Generat "--refresh", "--noconfirm", "--needed", - "mingw-w64-x86_64-python-pip", + "mingw-w64-ucrt-x86_64-python-pip", *pkg, ] uninstall_command = [ @@ -212,7 +212,7 @@ def check_whether_we_should_run() -> bool: pkgname = "-".join(pkgloc.name.split("-")[:-3]) if "-python-" in pkgname: return True - elif pkgname == "mingw-w64-x86_64-python": + elif pkgname == "mingw-w64-ucrt-x86_64-python": return False # now this is compilcated # need to find file listing in the package. @@ -228,7 +228,7 @@ def check_whether_we_should_run() -> bool: with open(Path(tempdir, pkgloc.stem), "rb") as file: with tarfile.open(fileobj=file, mode="r") as tar: for mem in tar.getmembers(): - if "mingw64/lib/python" in mem.name: + if "ucrt64/lib/python" in mem.name: return True return False diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bddc669ffc..d889501fd9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -126,7 +126,7 @@ jobs: - uses: actions/download-artifact@v3 continue-on-error: true with: - name: MINGW64-packages + name: UCRT64-packages path: C:/_/artifacts - name: Check whether to Run id: check-run @@ -135,8 +135,8 @@ jobs: - uses: msys2/setup-msys2@v2 if: steps.check-run.outputs.run == 'true' with: - msystem: MINGW64 - install: mingw-w64-x86_64-python-pip + msystem: UCRT64 + install: mingw-w64-ucrt-x86_64-python-pip release: false # since we aren't building anything - name: Add staging repo if: steps.check-run.outputs.run == 'true' @@ -163,11 +163,11 @@ jobs: id: artifacts continue-on-error: true with: - name: MINGW64-packages + name: UCRT64-packages path: artifacts - name: Grok packages uses: jeremyd2019/package-grokker/grok-artifacts@main if: steps.artifacts.outcome == 'success' with: - repo: mingw64 + repo: ucrt64 path: artifacts