From bf094f2fb1bd61c83d80fc398c7cf8950661b4ce Mon Sep 17 00:00:00 2001 From: Avery Black Date: Tue, 8 Oct 2024 21:02:03 -0700 Subject: [PATCH] Add VoodooSMBus to zip, upload to release --- .github/workflows/main.yml | 10 ++++++ VoodooRMI.xcodeproj/project.pbxproj | 48 ++++++++++++++++++++++++++++- 2 files changed, 57 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3e3498d..2ff1694 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,6 +28,9 @@ jobs: run: | src=$(/usr/bin/curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/master/ci-bootstrap.sh) && eval "$src" || exit 1 + - name: Link MacKernelSDK to VoodooSMBus + run: ln -s ${{ github.workspace }}/MacKernelSDK ${{ github.workspace }}/Dependencies/VoodooSMBus/MacKernelSDK + - name: Get Commit SHA id: vars run: | @@ -36,6 +39,13 @@ jobs: - run: xcodebuild -scheme VoodooRMI -derivedDataPath build -configuration Debug - run: xcodebuild -scheme VoodooRMI -derivedDataPath build -configuration Release + - uses: svenstaro/upload-release-action@v2 + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: build/Build/Products/*/*.zip + tag: ${{ github.ref }} + file_glob: true + - uses: actions/upload-artifact@v4 with: name: VoodooRMI-${{ steps.vars.outputs.sha_short }} diff --git a/VoodooRMI.xcodeproj/project.pbxproj b/VoodooRMI.xcodeproj/project.pbxproj index 79e9f68..cdaad26 100644 --- a/VoodooRMI.xcodeproj/project.pbxproj +++ b/VoodooRMI.xcodeproj/project.pbxproj @@ -67,6 +67,20 @@ remoteGlobalIDString = 6F4B4A8C24C1A0B80018F1F0; remoteInfo = RMII2C; }; + EEDAAB152CB631B50063AA4A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = EEDAAB112CB631B50063AA4A /* VoodooSMBus.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B3953FF922D8DBC100473323; + remoteInfo = VoodooSMBus; + }; + EEDAAB172CB631D50063AA4A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = EEDAAB112CB631B50063AA4A /* VoodooSMBus.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B3953FF822D8DBC100473323; + remoteInfo = VoodooSMBus; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -120,6 +134,7 @@ EE83B6D9298B1B3F0025DF3A /* RMIPowerStates.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RMIPowerStates.h; sourceTree = ""; }; EE83B709298C76380025DF3A /* RMIMessages.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RMIMessages.h; sourceTree = ""; }; EE912ED1298C95390003DBFE /* RMIFunction.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RMIFunction.cpp; sourceTree = ""; }; + EEDAAB112CB631B50063AA4A /* VoodooSMBus.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = VoodooSMBus.xcodeproj; path = Dependencies/VoodooSMBus/VoodooSMBus.xcodeproj; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -206,6 +221,7 @@ A4560EBD247F29EC0009CBE0 = { isa = PBXGroup; children = ( + EEDAAB112CB631B50063AA4A /* VoodooSMBus.xcodeproj */, A4560F02247F381B0009CBE0 /* Headers */, A4560EC9247F29EC0009CBE0 /* VoodooRMI */, A4560EC8247F29EC0009CBE0 /* Products */, @@ -302,6 +318,14 @@ path = LinuxCompat; sourceTree = ""; }; + EEDAAB122CB631B50063AA4A /* Products */ = { + isa = PBXGroup; + children = ( + EEDAAB162CB631B50063AA4A /* VoodooSMBus.kext */, + ); + name = Products; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -402,6 +426,7 @@ buildRules = ( ); dependencies = ( + EEDAAB182CB631D50063AA4A /* PBXTargetDependency */, 6F4B4AA924C1AEEA0018F1F0 /* PBXTargetDependency */, 286587DD24C1426600E74848 /* PBXTargetDependency */, ); @@ -438,6 +463,12 @@ mainGroup = A4560EBD247F29EC0009CBE0; productRefGroup = A4560EC8247F29EC0009CBE0 /* Products */; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = EEDAAB122CB631B50063AA4A /* Products */; + ProjectRef = EEDAAB112CB631B50063AA4A /* VoodooSMBus.xcodeproj */; + }, + ); projectRoot = ""; targets = ( A4560EC6247F29EC0009CBE0 /* VoodooRMI */, @@ -447,6 +478,16 @@ }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + EEDAAB162CB631B50063AA4A /* VoodooSMBus.kext */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = VoodooSMBus.kext; + remoteRef = EEDAAB152CB631B50063AA4A /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXResourcesBuildPhase section */ 286587D224C13D9600E74848 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -477,7 +518,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "# From Acidanthera's VoodooPS2\ncd \"${TARGET_BUILD_DIR}\"\ncp -r \"${PROJECT_DIR}/VoodooInput/${CONFIGURATION}/VoodooInput.kext\" \"${BUILT_PRODUCTS_DIR}/VoodooRMI.kext/Contents/PlugIns/\"\ndist=(\"VoodooRMI.kext\")\nif [ -d \"$DWARF_DSYM_FILE_NAME\" ]; then\n rm -rf dSYM\n mkdir dSYM\n mv \"$DWARF_DSYM_FILE_NAME\" dSYM/\n find ${FULL_PRODUCT_NAME} -name *.dSYM -exec mv {} dSYM/ \\;\n dist+=(dSYM);\nfi\n\narchive=\"VoodooRMI-${CURRENT_PROJECT_VERSION}-$(echo $CONFIGURATION | tr /a-z/ /A-Z/).zip\"\nrm -rf *.zip\nzip -qry -FS \"${archive}\" \"${dist[@]}\"\n\n"; + shellScript = "# From Acidanthera's VoodooPS2\ncd \"${TARGET_BUILD_DIR}\"\nrm -rf \"${FULL_PRODUCT_NAME}/Contents/PlugIns/VoodooInput.kext\"\nmkdir -p \"${FULL_PRODUCT_NAME}/Contents/PlugIns\"\ncp -r \"${PROJECT_DIR}/VoodooInput/${CONFIGURATION}\"/* \"${FULL_PRODUCT_NAME}/Contents/PlugIns/\"\ndist=(\"VoodooRMI.kext\" \"VoodooSMBus.kext\")\nif [ -d \"$DWARF_DSYM_FILE_NAME\" ]; then\n rm -rf dSYM\n mkdir dSYM\n mv \"$DWARF_DSYM_FILE_NAME\" dSYM/\n mv \"VoodooSMBus.kext.dSYM\" dSYM/\n find ${FULL_PRODUCT_NAME} -name *.dSYM -exec mv {} dSYM/ \\;\n dist+=(dSYM);\nfi\n\narchive=\"VoodooRMI-${CURRENT_PROJECT_VERSION}-$(echo $CONFIGURATION | tr /a-z/ /A-Z/).zip\"\nrm -rf *.zip\nzip -qry -FS \"${archive}\" \"${dist[@]}\"\n\n"; }; A4560EE8247F2CC00009CBE0 /* Bootstrap VoodooInput */ = { isa = PBXShellScriptBuildPhase; @@ -546,6 +587,11 @@ target = 6F4B4A8C24C1A0B80018F1F0 /* RMII2C */; targetProxy = 6F4B4AA824C1AEEA0018F1F0 /* PBXContainerItemProxy */; }; + EEDAAB182CB631D50063AA4A /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = VoodooSMBus; + targetProxy = EEDAAB172CB631D50063AA4A /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */