From 905f4240057f47bd86f13637301359d46434ab16 Mon Sep 17 00:00:00 2001 From: Andrea Marchesini Date: Thu, 18 Nov 2021 15:34:13 +0100 Subject: [PATCH] Reintroduce wasm with qt5 --- .github/workflows/wasm.yaml | 53 ++++++++++++++++++++++++++++++++----- 1 file changed, 46 insertions(+), 7 deletions(-) diff --git a/.github/workflows/wasm.yaml b/.github/workflows/wasm.yaml index fb0c17afe37..91c5e445f8b 100644 --- a/.github/workflows/wasm.yaml +++ b/.github/workflows/wasm.yaml @@ -11,7 +11,51 @@ on: - 'releases/**' jobs: - wasm: + wasmQt5: + name: Wasm Qt5 + runs-on: ubuntu-20.04 + + steps: + - name: Clone repository + uses: actions/checkout@v2 + + - name: Checkout submodules + shell: bash + run: | + auth_header="$(git config --local --get http.https://github.com/.extraheader)" + git submodule sync --recursive + git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1 + + - name: Install Qt + shell: bash + run: | + python3 -m pip install aqtinstall + python3 -m aqt install --outputdir /opt 5.15.2 linux desktop wasm_32 -m qtcharts + + - name: Install python dependencies + shell: bash + run: | + pip install -r requirements.txt + + - name: Setup emsdk + uses: mymindstorm/setup-emsdk@v7 + with: + version: 1.39.8 + + - name: Compiling + shell: bash + run: | + export PATH=/opt/5.15.2/wasm_32/bin:$PATH + ./scripts/wasm_compile.sh + + - name: Uploading + uses: actions/upload-artifact@v1 + with: + name: WebAssembly Build + path: wasm + + wasmQt6: + name: Wasm Qt6 runs-on: ubuntu-20.04 steps: @@ -56,11 +100,6 @@ jobs: export PATH=/opt/6.2.1/wasm_32/bin:/opt/6.2.1/gcc_64/bin:$PATH ./scripts/wasm_compile.sh - - name: Uploading - uses: actions/upload-artifact@v1 - with: - name: WebAssembly Build - path: wasm inspector: runs-on: ubuntu-20.04 steps: @@ -86,7 +125,7 @@ jobs: ghPages: runs-on: ubuntu-20.04 - needs: [wasm,inspector] + needs: [wasmQt5,inspector] name: Publish Wasm on Github Pages env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}