https://github.com/python/cpython/commit/069aac92c8c40e53b6931a4d31029c5c7bef0c15 commit: 069aac92c8c40e53b6931a4d31029c5c7bef0c15 branch: main author: Hood Chatham <[email protected]> committer: hoodmane <[email protected]> date: 2026-11-03T10:49:25-08:00 summary:
gh-145805: Change EMSDK_CACHE to PY_EMSDK_CACHE (#160989) Because Emscripten wants to own the environment variable EMSDK_CACHE. Required https://github.com/python/buildmaster-config/pull/826 first. files: M .github/workflows/reusable-emscripten.yml M Platforms/emscripten/__main__.py diff --git a/.github/workflows/reusable-emscripten.yml b/.github/workflows/reusable-emscripten.yml index f4fb5d4a5b0b6ab..d093c86eb2db967 100644 --- a/.github/workflows/reusable-emscripten.yml +++ b/.github/workflows/reusable-emscripten.yml @@ -39,7 +39,7 @@ jobs: f.write(f"node-version={config['node-version']}\n") f.write(f"deps-hash={h.hexdigest()}\n") with open(os.environ["GITHUB_ENV"], "a") as f: - f.write(f"EMSDK_CACHE={emsdk_cache}\n") + f.write(f"PY_EMSDK_CACHE={emsdk_cache}\n") - name: "Install Node.js" uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0 with: @@ -48,7 +48,7 @@ jobs: id: emsdk-cache uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 with: - path: ${{ env.EMSDK_CACHE }} + path: ${{ env.PY_EMSDK_CACHE }} key: emsdk-${{ steps.emscripten-config.outputs.emscripten-version }}-${{ steps.emscripten-config.outputs.deps-hash }} restore-keys: emsdk-${{ steps.emscripten-config.outputs.emscripten-version }} - name: "Install Python" diff --git a/Platforms/emscripten/__main__.py b/Platforms/emscripten/__main__.py index 84a1589b81f6a20..d28d93ce3bada99 100644 --- a/Platforms/emscripten/__main__.py +++ b/Platforms/emscripten/__main__.py @@ -812,12 +812,12 @@ def main(): subcommand.add_argument( "--emsdk-cache", action="store", - default=os.environ.get("EMSDK_CACHE"), + default=os.environ.get("PY_EMSDK_CACHE"), dest="emsdk_cache", help=( "Path to emsdk cache directory. If provided, validates that " "the required emscripten version is installed. " - "Can also be set with the EMSDK_CACHE environment variable." + "Can also be set with the PY_EMSDK_CACHE environment variable." ), ) _______________________________________________ Python-checkins mailing list -- [email protected] To unsubscribe send an email to [email protected] https://mail.python.org/mailman3//lists/python-checkins.python.org Member address: [email protected]
