From b42bc8faa25ad644a72941ec8cf731e877059215 Mon Sep 17 00:00:00 2001 From: Ben Brandt Date: Mon, 27 Jan 2025 22:22:53 +0100 Subject: [PATCH] fix: wasip2 target again for cpython for consistency --- .github/workflows/package_build.yml | 4 ++-- src/build/build_tools.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/package_build.yml b/.github/workflows/package_build.yml index 414cc44..31e883d 100644 --- a/.github/workflows/package_build.yml +++ b/.github/workflows/package_build.yml @@ -56,11 +56,11 @@ jobs: - uses: actions/cache@v4 with: path: cpython-3.12.8 - key: cpython-wasi-3.12.8 + key: cpython-wasi-3.12.8-wasi-sdk-25.0.0 - uses: actions/cache@v4 with: path: cpython-3.13.1 - key: cpython-wasi-3.13.1 + key: cpython-wasi-3.13.1-wasi-sdk-25.0.0 - uses: actions/cache@v4 with: path: wasi-sdk diff --git a/src/build/build_tools.rs b/src/build/build_tools.rs index 4c784f0..e70f06d 100644 --- a/src/build/build_tools.rs +++ b/src/build/build_tools.rs @@ -62,7 +62,7 @@ impl PythonVersion { fn wasi_dir(self) -> PathBuf { self.cpython_dir().join(match self { PythonVersion::Py3_12 => "builddir/wasi", - PythonVersion::Py3_13 => "cross-build/wasm32-wasip1", + PythonVersion::Py3_13 => "cross-build/wasm32-wasip2", }) } @@ -98,7 +98,7 @@ impl PythonVersion { const PYTHON_EXECUTABLE: &str = "python.exe"; #[cfg(not(any(target_os = "macos", target_os = "windows")))] const PYTHON_EXECUTABLE: &str = "python"; - const HOST_TRIPLE: &str = "wasm32-wasip1"; + const HOST_TRIPLE: &str = "wasm32-wasip2"; let github_branch = self.github_branch(); let cpython = self.cpython_dir();