https://github.com/python/cpython/commit/2f87976926c393ae683d8414c201759997c23ef8
commit: 2f87976926c393ae683d8414c201759997c23ef8
branch: 3.13
author: Miss Islington (bot) <[email protected]>
committer: brettcannon <[email protected]>
date: 2024-10-10T17:46:01Z
summary:

[3.13] GH-122578: update to WASI SDK 24 (GH-122960) (GH-122961)

GH-122578: update to WASI SDK 24 (GH-122960)
(cherry picked from commit 0e207f3e7adc6a0fdbe1482ce01163ff04d5ddcb)

Co-authored-by: Brett Cannon <[email protected]>

files:
A Misc/NEWS.d/next/Build/2024-08-12-15-48-49.gh-issue-122578.YJ3xEa.rst
M .devcontainer/Dockerfile
M .github/workflows/reusable-wasi.yml

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index a4ada1b66bf476..ada5fb0fe64dc2 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -2,7 +2,7 @@ FROM docker.io/library/fedora:40
 
 ENV CC=clang
 
-ENV WASI_SDK_VERSION=22
+ENV WASI_SDK_VERSION=24
 ENV WASI_SDK_PATH=/opt/wasi-sdk
 
 ENV WASMTIME_HOME=/opt/wasmtime
@@ -14,7 +14,7 @@ RUN dnf -y --nodocs --setopt=install_weak_deps=False install 
/usr/bin/{blurb,cla
     dnf -y clean all
 
 RUN mkdir ${WASI_SDK_PATH} && \
-    curl --location 
https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VERSION}/wasi-sdk-${WASI_SDK_VERSION}.0-linux.tar.gz
 | \
+    curl --location 
https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VERSION}/wasi-sdk-${WASI_SDK_VERSION}.0-x86_64-linux.tar.gz
 | \
     tar --strip-components 1 --directory ${WASI_SDK_PATH} --extract --gunzip
 
 RUN mkdir --parents ${WASMTIME_HOME} && \
diff --git a/.github/workflows/reusable-wasi.yml 
b/.github/workflows/reusable-wasi.yml
index 051d403b9c2595..4c8137c958a312 100644
--- a/.github/workflows/reusable-wasi.yml
+++ b/.github/workflows/reusable-wasi.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-22.04
     env:
       WASMTIME_VERSION: 22.0.0
-      WASI_SDK_VERSION: 22
+      WASI_SDK_VERSION: 24
       WASI_SDK_PATH: /opt/wasi-sdk
       CROSS_BUILD_PYTHON: cross-build/build
       CROSS_BUILD_WASI: cross-build/wasm32-wasi
@@ -35,7 +35,7 @@ jobs:
       if: steps.cache-wasi-sdk.outputs.cache-hit != 'true'
       run: |
         mkdir ${{ env.WASI_SDK_PATH }} && \
-        curl -s -S --location 
https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${{ 
env.WASI_SDK_VERSION }}/wasi-sdk-${{ env.WASI_SDK_VERSION }}.0-linux.tar.gz | \
+        curl -s -S --location 
https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${{ 
env.WASI_SDK_VERSION }}/wasi-sdk-${{ env.WASI_SDK_VERSION 
}}.0-x86_64-linux.tar.gz | \
         tar --strip-components 1 --directory ${{ env.WASI_SDK_PATH }} 
--extract --gunzip
     - name: "Configure ccache action"
       uses: hendrikmuhs/[email protected]
diff --git 
a/Misc/NEWS.d/next/Build/2024-08-12-15-48-49.gh-issue-122578.YJ3xEa.rst 
b/Misc/NEWS.d/next/Build/2024-08-12-15-48-49.gh-issue-122578.YJ3xEa.rst
new file mode 100644
index 00000000000000..5c1b9079909ff4
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2024-08-12-15-48-49.gh-issue-122578.YJ3xEa.rst
@@ -0,0 +1 @@
+Use WASI SDK 24 for testing.

_______________________________________________
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]

Reply via email to