Skip to content

Commit 48e9ff4

Browse files
try to fix rust for msys2
Signed-off-by: Cédrik Fuoco <[email protected]>
1 parent 5f438c5 commit 48e9ff4

File tree

1 file changed

+23
-4
lines changed

1 file changed

+23
-4
lines changed

.github/workflows/ci.yml

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -777,6 +777,13 @@ jobs:
777777
with:
778778
toolchain: stable
779779

780+
- name: Verify Rust installation
781+
run: |
782+
rustc --version
783+
cargo --version
784+
where rustc
785+
where cargo
786+
780787
- name: Cache CMake for Windows
781788
uses: actions/cache@v4
782789
id: windows-cmake-cache
@@ -801,12 +808,15 @@ jobs:
801808

802809
- name: Add Rust to PATH for msys2
803810
run: |
804-
echo $CARGO_HOME
811+
echo "export PATH=\"$HOME/.cargo/bin:\$PATH\"" >> ~/.bash_profile
812+
shell: msys2 {0}
805813

806-
- name: Add Rust to PATH for msys2
814+
- name: Verify Rust in msys2
807815
run: |
808-
echo $CARGO_HOME
809-
echo "$CARGO_HOME/bin" >> $GITHUB_PATH
816+
echo "Checking for Rust in msys2..."
817+
rustc --version || echo "WARNING: Rust not found in msys2 PATH"
818+
cargo --version || echo "WARNING: Cargo not found in msys2 PATH"
819+
echo "PATH: $PATH"
810820
shell: msys2 {0}
811821

812822
- name: Display environment variables
@@ -883,6 +893,15 @@ jobs:
883893
export QT_HOME=c:/Qt/${{ matrix.qt-version }}/msvc2019_64
884894
cmake -B _build -G "Visual Studio 17 2022" -A x64 -DRV_DEPS_WIN_PERL_ROOT=c:/Strawberry/perl/bin -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -DRV_DEPS_QT_LOCATION=$QT_HOME -DRV_VFX_PLATFORM=${{ matrix.vfx-platform }}
885895
shell: msys2 {0}
896+
897+
- name: Final Rust verification before build
898+
run: |
899+
echo "Verifying Rust is accessible for the build..."
900+
rustc --version
901+
cargo --version
902+
echo "Rust PATH:"
903+
where rustc
904+
shell: msys2 {0}
886905

887906
- name: Build OpenRV dependencies
888907
if: steps.cmake-dependencies.outputs.cache-hit != 'true'

0 commit comments

Comments
 (0)