diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index be6daa205..ce2139b76 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,12 +21,12 @@ jobs: runs-on: windows-2022 steps: - name: Checkout bx - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: bkaradzic/bx path: bx - name: Prepare - uses: microsoft/setup-msbuild@v1.1 + uses: microsoft/setup-msbuild@v2 - name: Build shell: cmd run: | @@ -47,10 +47,10 @@ jobs: { msystem: CLANG64, project: 'mingw-clang', bindir: 'win64_mingw-clang' }, ] name: mingw-${{ matrix.msystem }} - runs-on: windows-latest + runs-on: windows-2022 steps: - name: Checkout bx - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: bkaradzic/bx path: bx @@ -81,10 +81,10 @@ jobs: { config: release, binsuffix: Release }, ] name: linux-gcc-${{ matrix.config }}64 - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout bx - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: bkaradzic/bx path: bx @@ -106,10 +106,10 @@ jobs: { config: release, binsuffix: Release }, ] name: osx-x64-${{ matrix.config }} - runs-on: macos-latest + runs-on: macos-14 steps: - name: Checkout bx - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: bkaradzic/bx path: bx @@ -122,3 +122,28 @@ jobs: run: | cd bx ".build/osx-x64/bin/bx.test${{ matrix.binsuffix}}" -d yes + emscripten: + strategy: + fail-fast: true + matrix: + include: [ + { config: debug, binsuffix: Debug }, + { config: release, binsuffix: Release }, + ] + name: wasm + runs-on: ubuntu-24.04 + steps: + - name: Checkout bx + uses: actions/checkout@v4 + with: + repository: bkaradzic/bx + path: bx + - uses: mymindstorm/setup-emsdk@v14 + - name: Build + run: | + cd bx + tools/bin/linux/genie --gcc=wasm gmake + make -C .build/projects/gmake-wasm config=${{ matrix.config }} -j$(nproc) EMSCRIPTEN=/emsdk/upstream/emscripten + - name: Check + run: | + cd bx diff --git a/tests/run_test.cpp b/tests/run_test.cpp index a3c3fcf2d..973a820d7 100644 --- a/tests/run_test.cpp +++ b/tests/run_test.cpp @@ -36,9 +36,9 @@ int runAllTests(int _argc, const char* _argv[]) ", Arch: " BX_ARCH_NAME ", OS: " BX_PLATFORM_NAME ", CRT: " BX_CRT_NAME - ", C++: " BX_CPP_NAME - ", SIMD" + ", Features: " BX_CPP_NAME #if BX_SIMD_SUPPORTED + ", SIMD" # if BX_SIMD_AVX ", AVX" # endif // BX_SIMD_AVX @@ -51,8 +51,6 @@ int runAllTests(int _argc, const char* _argv[]) # if BX_SIMD_SSE ", SSE" # endif // BX_SIMD_SSE -#else - ": Not supported." #endif // BX_SIMD_SUPPORTED ", Date: " __DATE__