Skip to content

Commit

Permalink
Merge #2789
Browse files Browse the repository at this point in the history
2789: Use windows-2019 instead of windows-latest for CI r=Amanieu a=Amanieu

windows-latest was recently updated to windows-2022 which seems to cause
some issues related to stack unwinding through Wasm frames.

Co-authored-by: Amanieu d'Antras <amanieu@gmail.com>
  • Loading branch information
bors[bot] and Amanieu committed Feb 11, 2022
2 parents db0dc29 + ae648a6 commit 4fdf76b
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/test-sys.yaml
Expand Up @@ -67,7 +67,7 @@ jobs:
run_test: false
run_test_capi: false
- build: windows-x64
os: windows-latest
os: windows-2019
# llvm_url: 'https://github.com/wasmerio/llvm-custom-builds/releases/download/12.x/windows-amd64.tar.gz'
llvm_choco_version: 13.0.0
artifact_name: 'wasmer-windows-amd64'
Expand Down Expand Up @@ -250,12 +250,12 @@ jobs:
call refreshenv
set WASMER_DIR=%CD%\package
make test-integration
if: matrix.run_integration_tests && matrix.os == 'windows-latest'
if: matrix.run_integration_tests && matrix.os == 'windows-2019'
- name: Run integration tests (Unix)
run: |
export WASMER_DIR=`pwd`/package
make test-integration
if: matrix.run_integration_tests && matrix.os != 'windows-latest'
if: matrix.run_integration_tests && matrix.os != 'windows-2019'
- name: Run iOS integration tests
run: |
rustup target add aarch64-apple-ios x86_64-apple-ios
Expand Down Expand Up @@ -287,7 +287,7 @@ jobs:
#cp qjs_win_from_mac.wjit cross
cp target/release/wasmer cross
#- name: Cross compile from Windows
# if: matrix.os == 'windows-latest'
# if: matrix.os == 'windows-2019'
# shell: bash
# run: |
# alias wasmer=target/release/wasmer
Expand Down Expand Up @@ -346,7 +346,7 @@ jobs:
#test-cross-compile-on-win:
# needs: [setup, test]
# runs-on: windows-latest
# runs-on: windows-2019
# steps:
# - name: Download Wasmer
# uses: actions/download-artifact@v2
Expand Down

0 comments on commit 4fdf76b

Please sign in to comment.