Rename build artifacts (#8)

.github/actions/common_setup/action.yml

@@ -28,11 +28,14 @@ runs:
         echo "CPYTHON_DIR=$GITHUB_WORKSPACE/cpython" >> $GITHUB_ENV
         echo "BUILD_PYTHON_DIR=$GITHUB_WORKSPACE/cpython/builddir/build" >> $GITHUB_ENV
         echo "HOST_PYTHON_DIR=$GITHUB_WORKSPACE/cpython/builddir/host" >> $GITHUB_ENV
-        if test "${{ inputs.python_version }}" = "main"; then
-          echo "PYTHON_NAME=3.12-dev" >> $GITHUB_ENV
-        else
-          echo "PYTHON_NAME=${{ inputs.python_version }}" >> $GITHUB_ENV
-        fi
+
+        PYTHON_VERSION=${{ inputs.python_version }}
+        case "$PYTHON_VERSION" in
+          main) echo "PYTHON_NAME=3.12dev" >> $GITHUB_ENV;;
+          3.11) echo "PYTHON_NAME=3.11dev" >> $GITHUB_ENV;;
+          v*) echo "PYTHON_NAME=${PYTHON_VERSION:1}" >> $GITHUB_ENV;;
+          *) echo "PYTHON_NAME=$PYTHON_VERSION" >> $GITHUB_ENV;;
+        esac
     - name: Configure ccache action
       uses: hendrikmuhs/ccache-action@v1
       with:

.github/actions/package_emscripten/action.yml

@@ -22,7 +22,12 @@ runs:
       run: |
         set -e
 
-        RELEASE_NAME="emscripten-${{ inputs.flavor }}_py${{ env.PYTHON_NAME }}_emsdk-${{ inputs.emsdk_version }}"
+        EMSDK_VERSION=${{ inputs.emsdk_version }}
+        if test "$EMSDK_VERSION" = "latest"; then
+          EMSDK_VERSION=$(cat ${EMSDK_DIR}/upstream/emscripten/emscripten-version.txt | sed 's,",,g')
+        fi
+
+        RELEASE_NAME="Python-${{ env.PYTHON_NAME }}-wasm32-emscripten-${EMSDK_VERSION}-${{ inputs.flavor }}"
         RELEASE_BASE="$HOME/release"
         RELEASE_DIR="$RELEASE_BASE/$RELEASE_NAME"
         RELEASE_ZIP="$HOME/$RELEASE_NAME.zip"

.github/actions/package_wasi/action.yml

@@ -14,7 +14,7 @@ runs:
       run: |
         set -ex
 
-        RELEASE_NAME="wasi-py${{ env.PYTHON_NAME }}_wasisdk-${{ inputs.wasisdk_version }}"
+        RELEASE_NAME="Python-${{ env.PYTHON_NAME }}-wasm32-wasi-${{ inputs.wasisdk_version }}"
         RELEASE_BASE="$HOME/release"
         RELEASE_DIR="$RELEASE_BASE/$RELEASE_NAME"
         RELEASE_ZIP="$HOME/$RELEASE_NAME.zip"

.github/workflows/wasi.yml

@@ -62,5 +62,4 @@ jobs:
         id: package
         with:
           wasisdk_version: "${{ matrix.wasisdk_version }}"
-          wasmtime_version: "${{ matrix.wasmtime_version }}"
         if: "${{ matrix.wasmtime_version == 'latest' }}"

README.md

@@ -13,23 +13,23 @@ The `emsdk-tot-upstream` builds are using Emscripte tip-of-tree (nightlies).
 
 ### Emscripten browser target
 
-- `emscripten-browser_py3.11_emsdk-latest`: Python 3.11 branch, latest Emscripten SDK
-- `emscripten-browser_py3.12-dev_emsdk-latest`: Python main branch (3.12-dev), latest Emscripten SDK
+- `Python-3.11dev-wasm32-emscripten-3.1.18-browser`: Python 3.11 branch, Emscripten SDK 3.1.18
+- `Python-3.11dev-wasm32-emscripten-3.1.18-browser`: Python main branch (3.12), Emscripten SDK 3.1.18
 
 The files must be served from a web server. You can use the
 `wasm_webserver.py` script to run a local web server and
 access the browser REPL from http://localhost:8000/python.html
 
 ### Emscripte NodeJS target
 
-- `emscripten-node-dl_py3.11_emsdk-latest`: WASM dynamic linking, Python
-  3.11 branch, latest Emscripten SDK
-- `emscripten-node-dl_py3.12-dev_emsdk-latest`: WASM dynamic linking, Python
-  main branch (3.12-dev), latest Emscripten SDK
-- `emscripten-node-pthreads_py3.12-dev_emsdk-latest`: WASM pthreads emulation,
-  Python main branch (3.12-dev), latest Emscripten SDK
-- `emscripten-node-pthreads_py3.11_emsdk-latest`: WASM pthreads emulation,
-  Python 3.11 branch, latest Emscripten SDK
+- `Python-3.11dev-wasm32-emscripten-3.1.18-node-dl`: WASM dynamic linking, Python
+  3.11 branch, Emscripten SDK 3.1.18
+- `Python-3.12dev-wasm32-emscripten-3.1.18-node-dl`: WASM dynamic linking, Python
+  main branch (3.12), Emscripten SDK 3.1.18
+- `Python-3.11dev-wasm32-emscripten-3.1.18-node-pthreads`: WASM pthreads emulation,
+  Python 3.11 branch, Emscripten SDK 3.1.18
+- `Python-3.12dev-wasm32-emscripten-3.1.18-node-pthreads`: WASM pthreads emulation,
+  Python main branch (3.12), Emscripten SDK 3.1.18
 
 Run:
 
@@ -45,8 +45,8 @@ You may have to specify `--experimental-wasm-bigint` for older Node versions and
 
 [WASI nightly tests](https://github.com/tiran/cpython-wasm-test/actions/workflows/wasi.yml?query=event%3Aschedule)
 
-- `wasi_py3.11_wasisdk-16`: Python 3.11 with WASI-SDK 16
-- `wasi_py3.12-dev_wasisdk-16`: Python main branch (3.12-dev) with WASI-SDK 16
+- `Python-3.11dev-wasm32-wasi-16`: Python 3.11 with WASI-SDK 16
+- `Python-3.12dev-wasm32-wasi-16`: Python main branch (3.12-dev) with WASI-SDK 16
 
 Run: