Change to use --directory option for git apply

ryukau · Jan 6, 2024 · 89382f9 · 89382f9
1 parent eae5084
commit 89382f9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/build_instruction.md b/build_instruction.md
@@ -33,9 +33,7 @@ cd VSTPlugins
 # Patch vst3sdk.
 # - https://github.com/ryukau/VSTPlugins/issues/48
 # - https://github.com/steinbergmedia/vstgui/issues/126
-cd lib/vst3sdk/vstgui4/
-git apply ../../../ci/linux_patch/cairographicscontext.patch
-cd ../../../
+git apply --directory=lib/vst3sdk/vstgui4/ ci/linux_patch/cairographicscontext.patch
 
 cmake -S . -B build -DCMAKE_BUILD_TYPE=Release
 cmake --build build -j

diff --git a/ci/ci_ubuntu.sh b/ci/ci_ubuntu.sh
@@ -12,9 +12,7 @@ sudo apt-get install cmake gcc "libstdc++6" libx11-xcb-dev libxcb-util-dev libxc
 # Patch vst3sdk.
 # - https://github.com/ryukau/VSTPlugins/issues/48
 # - https://github.com/steinbergmedia/vstgui/issues/126
-cd lib/vst3sdk/vstgui4/
-git apply ../../../ci/linux_patch/cairographicscontext.patch
-cd ../../../
+git apply --directory=lib/vst3sdk/vstgui4/ ci/linux_patch/cairographicscontext.patch
 
 cmake -S . -B build -DCMAKE_BUILD_TYPE=Release
 cmake --build build