Update wasm for taskcluster too

Author: oskirby

taskcluster/docker/wasm/Dockerfile

@@ -2,35 +2,32 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-ARG DOCKER_IMAGE_PARENT=ubuntu:20.04
+ARG DOCKER_IMAGE_PARENT=ubuntu:22.04
 FROM $DOCKER_IMAGE_PARENT
 
 MAINTAINER Sebastian Streich <[email protected]>
 
-ARG QT_VERSION=6.2.4
+ARG QT_VERSION=6.6.3
 
 VOLUME /builds/worker/checkouts
 
 ENV CURL='curl --location --retry 5' \
     LANG='en_US.UTF-8' \
     TERM='dumb'
 
-RUN apt-get -q update && apt-get install -y tzdata && apt-get install -y git ccache python3 python3-pip wget libglib2.0-0 ninja-build && \
+RUN apt-get -q update && apt-get install -y tzdata && \
+    apt-get install -y git ccache python3 python3-pip wget libglib2.0-0 cmake ninja-build && \
     python3 -m pip install aqtinstall && \
     # qt6 for wasm needs the desktop linux installation
     python3 -m aqt install-qt -O /opt linux desktop ${QT_VERSION} gcc_64 && \
-    python3 -m aqt install-qt -O /opt linux desktop ${QT_VERSION} wasm_32 -m qtwebsockets qt5compat && \
+    python3 -m aqt install-qt -O /opt linux desktop ${QT_VERSION} wasm_singlethread -m qtwebsockets qt5compat && \
     cd /opt/ && \
     git clone https://github.com/emscripten-core/emsdk.git && \
     cd emsdk && \
-    ./emsdk install 2.0.14 && \
-    ./emsdk activate 2.0.14 && \
-    wget https://github.com/Kitware/CMake/releases/download/v3.24.0-rc4/cmake-3.24.0-rc4-linux-x86_64.sh && \
-    chmod +x cmake-3.24.0-rc4-linux-x86_64.sh && \
-    mkdir /tmp/cmake && \
-    ./cmake-3.24.0-rc4-linux-x86_64.sh --skip-license --prefix=/tmp/cmake
+    ./emsdk install 3.1.37 && \
+    ./emsdk activate 3.1.37
 
 ENV QTPATH=/opt/${QT_VERSION}/
 ENV EMSDKPATH=/opt/emsdk/
 
-ENV PATH="/opt/${QT_VERSION}/gcc_64/bin:${PATH}:/tmp/cmake/bin"
+ENV PATH="/opt/${QT_VERSION}/gcc_64/bin:${PATH}"

taskcluster/scripts/build/wasm.sh

@@ -14,9 +14,9 @@ git submodule update --init --depth 1
 
 pip3 install -r requirements.txt
 
-export PATH="$QTPATH/wasm_32/bin:$PATH"
+export PATH="$QTPATH/wasm_singlethread/bin:$PATH"
 mkdir build
-$QTPATH/wasm_32/bin/qt-cmake -S . -B build \
+$QTPATH/wasm_singlethread/bin/qt-cmake -S . -B build \
     -DCMAKE_BUILD_TYPE=MinSizeRel \
     -DQT_HOST_PATH=/$QTPATH/gcc_64 \
     -DQT_HOST_PATH_CMAKE_DIR=/$QTPATH/gcc_64/lib/cmake \