From dc63b8e0eaf96ec096809b60e65b0bdaa3ffd8aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Cig=C3=A1nek?= Date: Mon, 11 Sep 2023 10:35:52 +0200 Subject: [PATCH] Disable mounting in CI tests --- .github/workflows/ci.yml | 6 ++++-- .gitmodules | 1 + ouisync-plugin | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4d491b2ec..ca05a41bd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: - name: windows os: windows-latest test-env: - OUISYNC_LIB: ouisync-plugin\ouisync\target\debug\ouisync_ffi.so + OUISYNC_LIB: ouisync-plugin\ouisync\target\debug\ouisync_ffi.dll build-args: steps: @@ -101,7 +101,9 @@ jobs: - name: Build Ouisync library for tests run: | cd ouisync-plugin/ouisync - cargo build --package ouisync-ffi + cargo build --package ouisync-ffi --no-default-features + dir ouisync-plugin\ouisync\target + dir ouisync-plugin\ouisync\target\debug - name: Run tests run: diff --git a/.gitmodules b/.gitmodules index a7ed35b47..4b843bd36 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "ouisync-plugin"] path = ouisync-plugin url = https://github.com/equalitie/ouisync-plugin + branch = mount-feature diff --git a/ouisync-plugin b/ouisync-plugin index 661025b82..3042ce19b 160000 --- a/ouisync-plugin +++ b/ouisync-plugin @@ -1 +1 @@ -Subproject commit 661025b8248fc2139edf24743a39fa0b01c87913 +Subproject commit 3042ce19bf09efd23be8690b371de12324d1f412