Skip to content

Commit 35b9b1e

Browse files
authored
Fix/update tinyinst (Fixes #3565) (#3580)
* Try tinyinst-rs fix (#3565) * Use latest tinyinst-rs * Fix more fix
1 parent a25f1de commit 35b9b1e

File tree

8 files changed

+82
-92
lines changed

8 files changed

+82
-92
lines changed

.github/workflows/build_and_test.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -869,7 +869,8 @@ jobs:
869869
- name: Prepare
870870
uses: ./.github/workflows/windows-tester-prepare
871871
- name: install cxx bridge
872-
run: cargo install cxxbridge-cmd
872+
# Needs to match version in tinyinst-rs
873+
run: cargo install cxxbridge-cmd@=1.0.190
873874
- name: Configure Cache
874875
uses: Swatinem/rust-cache@v2
875876
with:
@@ -916,7 +917,8 @@ jobs:
916917
- name: Install deps
917918
run: brew install z3 gtk+3 python llvm@${{env.MAIN_LLVM_VERSION}}
918919
- name: Install cxxbridge
919-
run: cargo install cxxbridge-cmd
920+
# Needs to match version in tinyinst-rs
921+
run: cargo install cxxbridge-cmd@=1.0.190
920922
- uses: actions/checkout@v4
921923
- uses: Swatinem/rust-cache@v2
922924
- name: MacOS Build

.github/workflows/fuzzer-tester-prepare/action.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ runs:
2626
- name: Add toolchain
2727
if: ${{ inputs.fuzzer-name == 'binary_only/tinyinst_simple' }}
2828
shell: bash
29-
run: cargo install cxxbridge-cmd
29+
# Needs to match version in tinyinst-rs
30+
run: cargo install cxxbridge-cmd@=1.0.190
3031
- name: Add nyx deps
3132
if: ${{ inputs.fuzzer-name == 'full_system/nyx_launcher' || inputs.fuzzer-name == 'full_system/nyx_libxml2_standalone' || inputs.fuzzer-name == 'full_system/nyx_libxml2_parallel' }}
3233
shell: bash

0 commit comments

Comments
 (0)