Skip to content

Commit

Permalink
hooking up force_host
Browse files Browse the repository at this point in the history
  • Loading branch information
KevKeating committed Feb 27, 2025
1 parent 9840ddb commit e120493
Showing 1 changed file with 3 additions and 11 deletions.
14 changes: 3 additions & 11 deletions .github/workflows/sketcher-builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ jobs:
with:
library: fmt
version: ${{ fromJson(env.VERSIONS_JSON).fmt }}
use_emsdk: ${{ matrix.build-output == 'wasm' }}

- name: Fetch zlib
if: matrix.build-output != 'wasm'
Expand All @@ -74,31 +73,27 @@ jobs:
with:
library: zlib
version: ${{ fromJson(env.VERSIONS_JSON).zlib }}
use_emsdk: ${{ matrix.build-output == 'wasm' }}

- name: Fetch zstd
id: fetch-zstd
uses: ./.github/actions/build-external
with:
library: zstd
version: ${{ fromJson(env.VERSIONS_JSON).zstd }}
use_emsdk: ${{ matrix.build-output == 'wasm' }}

- name: Fetch Boost
id: fetch-boost
uses: ./.github/actions/build-external
with:
library: boost
version: ${{ fromJson(env.VERSIONS_JSON).boost }}
use_emsdk: ${{ matrix.build-output == 'wasm' }}

- name: Fetch RDKit
id: fetch-rdkit
uses: ./.github/actions/build-external
with:
library: rdkit
version: ${{ fromJson(env.VERSIONS_JSON).rdkit }}
use_emsdk: ${{ matrix.build-output == 'wasm' }}

- name: Install Qt's required packages
if: ${{ matrix.os == 'ubuntu-latest' }}
Expand Down Expand Up @@ -130,31 +125,28 @@ jobs:
libxkbcommon-x11-dev \
libxrender-dev
- name: Configure Host Qt
- name: Configure host Qt
if: matrix.build-output == 'wasm'
run: |
cmake -B build/external/host/ -S external/ -G Ninja \
-DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }}
- name: Fetch Host Qt
- name: Fetch host Qt
id: fetch-host-qt
if: matrix.build-output == 'wasm'
uses: ./.github/actions/build-external
with:
library: qt
version: ${{ fromJson(env.VERSIONS_JSON).qt }}
use_emsdk: false
force_host: true


- name: Fetch Qt
id: fetch-qt
if: matrix.build-output != 'wasm'
uses: ./.github/actions/build-external
with:
library: qt
version: ${{ fromJson(env.VERSIONS_JSON).qt }}
use_emsdk: ${{ matrix.build-output == 'wasm' }}

- name: Configure CMake
if: matrix.build-output != 'wasm'
Expand Down

0 comments on commit e120493

Please sign in to comment.