Skip to content

Commit

Permalink
feat: Reduce build time by including Lilu as a submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
VisualEhrmanntraut committed Aug 29, 2024
1 parent 1de8974 commit 402a36b
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 11 deletions.
8 changes: 0 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: "recursive"
- name: CI Bootstrap
run: src=$(/usr/bin/curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/master/ci-bootstrap.sh) && eval "$src" || exit 1
- name: Lilu Bootstrap
run: src=$(/usr/bin/curl -Lfs https://raw.githubusercontent.com/acidanthera/Lilu/master/Lilu/Scripts/bootstrap.sh) && eval "$src" || exit 1
- run: xcodebuild -configuration Debug -arch x86_64 build
- run: xcodebuild -configuration Release -arch x86_64 build
- name: Upload to Artifacts
Expand Down Expand Up @@ -54,9 +50,5 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: "recursive"
- name: CI Bootstrap
run: src=$(/usr/bin/curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/master/ci-bootstrap.sh) && eval "$src" || exit 1
- name: Lilu Bootstrap
run: src=$(/usr/bin/curl -Lfs https://raw.githubusercontent.com/acidanthera/Lilu/master/Lilu/Scripts/bootstrap.sh) && eval "$src" || exit 1
- run: xcodebuild analyze -quiet -scheme ForgedInvariant -configuration Debug -arch x86_64 CLANG_ANALYZER_OUTPUT=plist-html CLANG_ANALYZER_OUTPUT_DIR="$(pwd)/clang-analyze" && [ "$(find clang-analyze -name "*.html")" = "" ]
- run: xcodebuild analyze -quiet -scheme ForgedInvariant -configuration Release -arch x86_64 CLANG_ANALYZER_OUTPUT=plist-html CLANG_ANALYZER_OUTPUT_DIR="$(pwd)/clang-analyze" && [ "$(find clang-analyze -name "*.html")" = "" ]
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "MacKernelSDK"]
path = MacKernelSDK
url = https://github.com/Acidanthera/MacKernelSDK.git
[submodule "Lilu"]
path = Lilu
url = https://github.com/acidanthera/Lilu
6 changes: 3 additions & 3 deletions ForgedInvariant.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
1C748C271C21952C0024EED2 /* ForgedInvariant.kext */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ForgedInvariant.kext; sourceTree = BUILT_PRODUCTS_DIR; };
1C748C2C1C21952C0024EED2 /* Plugin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Plugin.cpp; sourceTree = "<group>"; };
1C748C2E1C21952C0024EED2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
40FEDF462BE01162008521DD /* plugin_start.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = plugin_start.cpp; path = Lilu.kext/Contents/Resources/Library/plugin_start.cpp; sourceTree = "<group>"; };
40FEDF462BE01162008521DD /* plugin_start.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = plugin_start.cpp; path = Lilu/Lilu/Library/plugin_start.cpp; sourceTree = "<group>"; };
CE8DA0822517C41A008C44E8 /* libkmod.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libkmod.a; path = MacKernelSDK/Library/x86_64/libkmod.a; sourceTree = SOURCE_ROOT; };
D579D09C2A629F5300A4BCCE /* ForgedInvariant.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ForgedInvariant.cpp; sourceTree = "<group>"; };
D579D09D2A629F5300A4BCCE /* ForgedInvariant.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = ForgedInvariant.hpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -239,7 +239,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"$(PROJECT_DIR)/Lilu.kext/Contents/Resources",
"$(PROJECT_DIR)/Lilu/Lilu",
"$(PROJECT_DIR)/MacKernelSDK/Headers",
);
KERNEL_EXTENSION_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/MacKernelSDK/Headers";
Expand Down Expand Up @@ -298,7 +298,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"$(PROJECT_DIR)/Lilu.kext/Contents/Resources",
"$(PROJECT_DIR)/Lilu/Lilu",
"$(PROJECT_DIR)/MacKernelSDK/Headers",
);
KERNEL_EXTENSION_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/MacKernelSDK/Headers";
Expand Down
1 change: 1 addition & 0 deletions Lilu
Submodule Lilu added at cedfe8

0 comments on commit 402a36b

Please sign in to comment.