Skip to content

Commit

Permalink
fixup! [Core] Use OpenAssetIO-MediaCreation
Browse files Browse the repository at this point in the history
  • Loading branch information
foundrytom committed Aug 16, 2023
1 parent 8d42ced commit 9b670db
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
5 changes: 3 additions & 2 deletions .github/build_openassetio_mediacreation/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,15 @@ runs:
- name: Checkout OpenAssetIO-MediaCreation
uses: actions/checkout@v3
with:
repository: OpenAssetIO-MediaCreation/OpenAssetIO-MediaCreation
repository: OpenAssetIO/OpenAssetIO-MediaCreation
path: openassetio-mediacreation-checkout

- name: Build OpenAssetIO-MediaCreation
shell: bash
run: |
cd openassetio-medeacreation-checkout
cd openassetio-mediacreation-checkout
mkdir build
python -m pip install openassetio-traitgen
cmake -G Ninja -S . -B build
cmake --build build
cmake --install build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ jobs:

- name: Configure CMake build
run: >
cmake -DCMAKE_PREFIX_PATH="./openassetio-build:./openassetio-mediacreation-build"
cmake -DCMAKE_PREFIX_PATH="./openassetio-build;./openassetio-mediacreation-build"
-S . -B build -G Ninja
--install-prefix ${{ github.workspace }}/dist
--preset lint
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,13 @@ jobs:

- name: Build and install Resolver
run: |
cmake -S . -DCMAKE_PREFIX_PATH="./openassetio-build:./openassetio-mediacreation-build" -B build
cmake -S . -DCMAKE_PREFIX_PATH="./openassetio-build;./openassetio-mediacreation-build" -B build
cmake --build build
cmake --install build
- run: |
python -m pip install -r tests/requirements.txt
python -n pip install importlib-metadata
# PYTHONPATH here is extended with `/usr/local/lib/python`
# because the USD install on this docker container is odd, and
Expand Down

0 comments on commit 9b670db

Please sign in to comment.