From 371ab4c6a7ef463f55dedcdd6247bd51ce257b7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Remko=20Tron=C3=A7on?= Date: Thu, 6 Oct 2022 21:34:30 +0200 Subject: [PATCH] github: Add Windows support for some standalone steps The actual build & link still needs to be done --- .github/actions/setup/action.yml | 6 ++++-- .github/workflows/build-standalone.yml | 8 ++++++-- build-package.js | 4 +++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 045b73b..78864d9 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -19,7 +19,9 @@ runs: sudo mv /tmp/wabt-1.0.30/lib/*.a /usr/local/lib shell: bash - if: runner.os == 'Windows' - run: echo "Not supported yet" - shell: cmd + run: | + curl -L -s https://github.com/WebAssembly/wabt/releases/download/1.0.30/wabt-1.0.30-windows.tar.gz | tar xvz -C /c/tools + cp /c/tools/wabt-1.0.30/bin/* /c/Windows/system32 + shell: bash - run: yarnpkg --pure-lockfile shell: bash diff --git a/.github/workflows/build-standalone.yml b/.github/workflows/build-standalone.yml index f1b07db..2111b1b 100644 --- a/.github/workflows/build-standalone.yml +++ b/.github/workflows/build-standalone.yml @@ -10,10 +10,14 @@ jobs: build-standalone: strategy: matrix: - os: [macos-latest, ubuntu-18.04] + os: [macos-latest, ubuntu-18.04, windows-latest] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 - uses: ./.github/actions/setup - run: make -C src/standalone install-deps all - - run: make -C src/standalone check \ No newline at end of file + # TODO: Windows support + if: runner.os != 'Windows' + - run: make -C src/standalone check + # TODO: Windows support + if: runner.os != 'Windows' \ No newline at end of file diff --git a/build-package.js b/build-package.js index b4b0f7f..daeff73 100755 --- a/build-package.js +++ b/build-package.js @@ -23,7 +23,9 @@ let buildConfig = { esbuild.build(buildConfig).then( () => { - execSync("./node_modules/.bin/tsc --project tsconfig.package.json"); + execSync( + "node node_modules/typescript/bin/tsc --project tsconfig.package.json" + ); }, () => process.exit(1) );