Merge pull request #2 from Lorys89/dev/refactor

add build action
macos86 · May 30, 2024 · 27c9b94 · 27c9b94
2 parents ef2b14b + e6d0b5b
commit 27c9b94
Show file tree

Hide file tree

Showing 19 changed files with 58 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -0,0 +1,38 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+  release:
+    types: [published]
+
+env:
+  PROJECT_TYPE: KEXT
+
+jobs:
+  build:
+    name: Build
+    runs-on: macos-latest
+    env:
+      JOB_TYPE: BUILD
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
+      - run: xcodebuild -configuration Debug
+      - run: xcodebuild -configuration Release
+
+      - name: Upload to Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: Artifacts
+          path: Installer/*.zip
+      - name: Upload to Release
+        if: github.event_name == 'release'
+        uses: svenstaro/upload-release-action@e74ff71f7d8a4c4745b560a485cc5fdb9b5b999d
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: build/*/*.zip
+          tag: ${{ github.ref }}
+          file_glob: true     
+
diff --git a/.gitignore b/.gitignore
@@ -27,3 +27,4 @@ DerivedData/
 
 ## Gcc Patch
 /*.gcno
+Installer/ComboJack
diff --git a/ComboJack_Source/Combo Jack/PCI.h → Combo Jack/PCI.h b/ComboJack_Source/Combo Jack/PCI.h → Combo Jack/PCI.h
diff --git a/ComboJack_Source/Combo Jack/PCI.m → Combo Jack/PCI.m b/ComboJack_Source/Combo Jack/PCI.m → Combo Jack/PCI.m
diff --git a/ComboJack_Source/Combo Jack/Tables.h → Combo Jack/Tables.h b/ComboJack_Source/Combo Jack/Tables.h → Combo Jack/Tables.h
diff --git a/ComboJack_Source/Combo Jack/hda-verb.h → Combo Jack/hda-verb.h b/ComboJack_Source/Combo Jack/hda-verb.h → Combo Jack/hda-verb.h
diff --git a/ComboJack_Source/Combo Jack/hda-verb.m → Combo Jack/hda-verb.m b/ComboJack_Source/Combo Jack/hda-verb.m → Combo Jack/hda-verb.m
diff --git a/...ource/ComboJack.xcodeproj/project.pbxproj → ComboJack.xcodeproj/project.pbxproj b/...ource/ComboJack.xcodeproj/project.pbxproj → ComboJack.xcodeproj/project.pbxproj
@@ -15,6 +15,10 @@
 		3D086A6A21BD498700FFD44C /* PCI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PCI.m; sourceTree = "<group>"; };
 		3D086A6B21BD498700FFD44C /* PCI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PCI.h; sourceTree = "<group>"; };
 		3D2BE1A921BD50C300FA7A55 /* Tables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Tables.h; sourceTree = "<group>"; };
+		77B667222C08817C00A9170D /* com.ComboJack.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = com.ComboJack.plist; sourceTree = "<group>"; };
+		77B667232C08818A00A9170D /* uninstall.command */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = uninstall.command; sourceTree = "<group>"; };
+		77B667242C08818A00A9170D /* Headphone.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Headphone.icns; sourceTree = "<group>"; };
+		77B667252C08818A00A9170D /* install.command */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = install.command; sourceTree = "<group>"; };
 		77E5F6D22C04873A001B0FCB /* hda-verb.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "hda-verb.h"; sourceTree = "<group>"; };
 		CB3D2DA71F0DFEDE00CF6EBA /* hda-verb.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "hda-verb.m"; sourceTree = "<group>"; };
 		CB3D58431F0A7DE000F741BA /* ComboJack */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = ComboJack; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -31,10 +35,22 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		77B667212C08802A00A9170D /* Installer */ = {
+			isa = PBXGroup;
+			children = (
+				77B667242C08818A00A9170D /* Headphone.icns */,
+				77B667252C08818A00A9170D /* install.command */,
+				77B667232C08818A00A9170D /* uninstall.command */,
+				77B667222C08817C00A9170D /* com.ComboJack.plist */,
+			);
+			path = Installer;
+			sourceTree = "<group>";
+		};
 		CB3D583A1F0A7DE000F741BA = {
 			isa = PBXGroup;
 			children = (
 				CB3D58451F0A7DE000F741BA /* ComboJack */,
+				77B667212C08802A00A9170D /* Installer */,
 				CB3D58441F0A7DE000F741BA /* Products */,
 			);
 			sourceTree = "<group>";
@@ -129,8 +145,8 @@
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n#cd \"${TARGET_BUILD_DIR}\"\n#cp -f ComboJack ../../../ComboJack_Installer/\n";
+			shellPath = /bin/bash;
+			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n#cd \"${TARGET_BUILD_DIR}\"\nif [ \"$CONFIGURATION\" == \"Release\" ]; then\n    cp -f ${TARGET_BUILD_DIR}/ComboJack Installer/\n\n    cd Installer\n    archive=\"${PRODUCT_NAME}-${MODULE_VERSION}-$(echo $CONFIGURATION | tr /a-z/ /A-Z/).zip\"\n    rm -rf *.zip\n    zip -qry -FS \"${archive}\" *\nfi\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

diff --git a/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata b/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
diff --git a/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist b/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/ComboJack_Installer/ComboJack b/ComboJack_Installer/ComboJack
diff --git a/ComboJack_Installer/Headphone.icns → Headphone.icns b/ComboJack_Installer/Headphone.icns → Headphone.icns
diff --git a/ComboJack_Source/Headphone.icns → Installer/Headphone.icns b/ComboJack_Source/Headphone.icns → Installer/Headphone.icns
diff --git a/ComboJack_Installer/Screenshot.png → Installer/Screenshot.png b/ComboJack_Installer/Screenshot.png → Installer/Screenshot.png
diff --git a/ComboJack_Installer/com.ComboJack.plist → Installer/com.ComboJack.plist b/ComboJack_Installer/com.ComboJack.plist → Installer/com.ComboJack.plist
diff --git a/ComboJack_Installer/install.command → Installer/install.command b/ComboJack_Installer/install.command → Installer/install.command
diff --git a/ComboJack_Installer/uninstall.command → Installer/uninstall.command b/ComboJack_Installer/uninstall.command → Installer/uninstall.command
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # ComboJack
 
-![screen](./ComboJack_Installer/Screenshot.png)
+![screen](./Installer/Screenshot.png)
 
 Hackintosh combojack support for alc236 layout 68/alc256 layout 56/alc289 layout 68/alc295 layout 33.
 

diff --git a/ComboJack_Source/build.command → build.command b/ComboJack_Source/build.command → build.command
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,3 +27,4 @@ DerivedData/

		## Gcc Patch
		/*.gcno
		Installer/ComboJack