diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index abe42f4c9fc..118ddf3bb6f 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -36,10 +36,10 @@ runs: sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100 sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-13 100 - wget https://github.com/WebAssembly/wabt/releases/download/1.0.23/wabt-1.0.23-ubuntu.tar.gz - tar -xzf ./wabt-1.0.23-ubuntu.tar.gz - rm ./wabt-1.0.23-ubuntu.tar.gz - echo "${{ github.workspace }}/wabt-1.0.23/bin" >> $GITHUB_PATH + wget https://github.com/WebAssembly/wabt/releases/download/1.0.35/wabt-1.0.35-ubuntu-20.04.tar.gz + tar -xzf ./wabt-1.0.35-ubuntu-20.04.tar.gz + rm ./wabt-1.0.35-ubuntu-20.04.tar.gz + echo "${{ github.workspace }}/wabt-1.0.35/bin" >> $GITHUB_PATH - name: 'Install JS dependencies' if: ${{ inputs.os == 'Linux' }} diff --git a/.github/workflows/libjs-test262.yml b/.github/workflows/libjs-test262.yml index d176a44a405..278a8a6e2a7 100644 --- a/.github/workflows/libjs-test262.yml +++ b/.github/workflows/libjs-test262.yml @@ -50,11 +50,11 @@ jobs: run: | sudo apt-get update sudo apt-get install -y ninja-build unzip gcc-13 g++-13 jq wget - test -e /opt/wabt-1.0.27 || ( + test -e /opt/wabt-1.0.35 || ( cd /tmp - wget https://github.com/WebAssembly/wabt/releases/download/1.0.27/wabt-1.0.27-ubuntu.tar.gz - sudo tar xf wabt-1.0.27-ubuntu.tar.gz -C /opt - rm wabt-1.0.27-ubuntu.tar.gz + wget https://github.com/WebAssembly/wabt/releases/download/1.0.35/wabt-1.0.35-ubuntu-20.04.tar.gz + sudo tar xf wabt-1.0.35-ubuntu-20.04.tar.gz -C /opt + rm wabt-1.0.35-ubuntu-20.04.tar.gz ) - name: Setup Python @@ -86,7 +86,7 @@ jobs: - name: Build test262-runner, test-js and test-wasm working-directory: libjs-test262 run: | - env PATH="/opt/wabt-1.0.27/bin:$PATH" \ + env PATH="/opt/wabt-1.0.35/bin:$PATH" \ cmake -GNinja -B Build \ -DCMAKE_C_COMPILER=gcc-13 \ -DCMAKE_CXX_COMPILER=g++-13 \ diff --git a/Documentation/AdvancedBuildInstructions.md b/Documentation/AdvancedBuildInstructions.md index 893dca22051..35a46ecd15f 100644 --- a/Documentation/AdvancedBuildInstructions.md +++ b/Documentation/AdvancedBuildInstructions.md @@ -26,7 +26,7 @@ There are some optional features that can be enabled during compilation that are - `ENABLE_ALL_THE_DEBUG_MACROS`: used for checking whether debug code compiles on CI. This should not be set normally, as it clutters the console output and makes the system run very slowly. Instead, enable only the needed debug macros, as described below. - `ENABLE_COMPILETIME_FORMAT_CHECK`: checks for the validity of `std::format`-style format string during compilation. Enabled by default. - `LAGOM_TOOLS_ONLY`: Skips building libraries, utiltis and tests for [Lagom](../Meta/Lagom/ReadMe.md). Mostly only useful for cross-compilation. -- `INCLUDE_WASM_SPEC_TESTS`: downloads and includes the WebAssembly spec testsuite tests. In order to use this option, you will need to install `prettier` and `wabt`. wabt version 1.0.23 or higher is required to pre-process the WebAssembly spec testsuite. +- `INCLUDE_WASM_SPEC_TESTS`: downloads and includes the WebAssembly spec testsuite tests. In order to use this option, you will need to install `prettier` and `wabt`. wabt version 1.0.35 or higher is required to pre-process the WebAssembly spec testsuite. - `INCLUDE_FLAC_SPEC_TESTS`: downloads and includes the xiph.org FLAC test suite. - `SERENITY_CACHE_DIR`: sets the location of a shared cache of downloaded files. Should not need to be set manually unless managing a distribution package. - `ENABLE_NETWORK_DOWNLOADS`: allows downloading files from the internet during the build. Default on, turning off enables offline builds. For offline builds, the structure of the SERENITY_CACHE_DIR must be set up the way that the build expects.