diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d0e6215d..c68b003d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: - name: Setup fuse run: | sudo apt-get update - sudo apt-get install fuse libfuse-dev + sudo apt-get install fuse3 libfuse3-dev - name: Maven build run: mvn -B verify -Plinux-amd64 - uses: actions/upload-artifact@v2 diff --git a/.gitmodules b/.gitmodules index c16f993b..3d1b5e73 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,12 @@ -[submodule "libfuse"] - path = libfuse +[submodule "libfuse2"] + path = libfuse2 url = https://github.com/libfuse/libfuse.git - branch = fuse-2_9_bugfix + branch = fuse_2_9_bugfix + +[submodule "libfuse3"] + path = libfuse3 + url = https://github.com/libfuse/libfuse.git + branch = master [submodule "winfsp"] path = winfsp diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index dbf56047..311f1cf1 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,5 +1,6 @@ +