diff --git a/.github/workflows/custom.yml b/.github/workflows/custom.yml index 9290f11f..13dc2381 100644 --- a/.github/workflows/custom.yml +++ b/.github/workflows/custom.yml @@ -51,13 +51,19 @@ env: jobs: build: - runs-on: macos-12 + name: macOS XCODE5 + runs-on: macos-latest + env: + JOB_TYPE: BUILD + HOMEBREW_NO_INSTALL_CLEANUP: 1 + HOMEBREW_NO_AUTO_UPDATE: 1 steps: - - uses: ruby/setup-ruby@v1 + - name: Set up Ruby + uses: ruby/setup-ruby@v1 with: ruby-version: '3.3' - - name: Set up Python 3 + - name: Set up Python uses: actions/setup-python@v5 with: python-version: '3.11' diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 70819490..a5f6fb1c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,61 +1,76 @@ -name: tests -on: - push: - workflow_dispatch: - -env: - # rel, pre, mod - OCVER: pre - -jobs: - test-and-cover: - runs-on: macos-12 - steps: - - name: Checkout - uses: actions/checkout@main - - - name: Initialization environment - run : | - git config --global user.email "github-actions[bot]@users.noreply.github.com" - git config --global user.name "github-actions[bot]" - sudo systemsetup -settimezone "Asia/Shanghai" - - #- uses: brokeyourbike/ocvalidate-action@v0.2 - # with: - # opencore-version: '0.8.6' - # release: true - # - #- run: | - # ocvalidate "EFI/OC/config.plist" || exit 1 - # ocvalidate "EFI/OC/config_iGPU.plist" || exit 1 - # ocvalidate "EFI/OC/config_RX5700XT.plist" || exit 1 - # ocvalidate "EFI/OC/config_RX5700XT&iGPU.plist" || exit 1 - - - name: Get OC-Mod - run: | - brew install jq - - if [ $OCVER == 'rel' ]; then - url="https://api.github.com/repos/acidanthera/OpenCorePkg/releases/latest" - elif [ $OCVER == 'pre' ]; then - url="https://api.github.com/repos/dortania/build-repo/releases/latest" - else - url="https://api.github.com/repos/wjz304/OpenCore_NO_ACPI_Build/releases/latest" - fi - - ocdownloadurl=$(curl -L ${url} | jq -r .assets[1].browser_download_url) - curl -L ${ocdownloadurl} -o oc.zip - unzip oc.zip -d oc - - - name: OC Validate - run: | - oc/Utilities/ocvalidate/ocvalidate "EFI/OC/config.plist" || exit 1 - oc/Utilities/ocvalidate/ocvalidate "EFI/OC/config_iGPU.plist" || exit 1 - oc/Utilities/ocvalidate/ocvalidate "EFI/OC/config_RX5700XT.plist" || exit 1 - oc/Utilities/ocvalidate/ocvalidate "EFI/OC/config_RX5700XT&iGPU.plist" || exit 1 - - #- name: Delete workflow runs - # uses: Mattraks/delete-workflow-runs@v2 - # with: - # retain_days: 1 +name: tests +on: + push: + workflow_dispatch: + +env: + # rel, pre, mod + OCVER: pre + +jobs: + test-and-cover: + name: macOS XCODE5 + runs-on: macos-latest + env: + JOB_TYPE: BUILD + HOMEBREW_NO_INSTALL_CLEANUP: 1 + HOMEBREW_NO_AUTO_UPDATE: 1 + steps: + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: '3.3' + + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: '3.11' + + - name: Checkout + uses: actions/checkout@main + + - name: Initialization environment + run : | + git config --global user.email "github-actions[bot]@users.noreply.github.com" + git config --global user.name "github-actions[bot]" + sudo systemsetup -settimezone "Asia/Shanghai" + + #- uses: brokeyourbike/ocvalidate-action@v0.2 + # with: + # opencore-version: '0.8.6' + # release: true + # + #- run: | + # ocvalidate "EFI/OC/config.plist" || exit 1 + # ocvalidate "EFI/OC/config_iGPU.plist" || exit 1 + # ocvalidate "EFI/OC/config_RX5700XT.plist" || exit 1 + # ocvalidate "EFI/OC/config_RX5700XT&iGPU.plist" || exit 1 + + - name: Get OC-Mod + run: | + # brew install jq # Warning: jq 1.7.1 is already installed and up-to-date. + + if [ $OCVER == 'rel' ]; then + url="https://api.github.com/repos/acidanthera/OpenCorePkg/releases/latest" + elif [ $OCVER == 'pre' ]; then + url="https://api.github.com/repos/dortania/build-repo/releases/latest" + else + url="https://api.github.com/repos/wjz304/OpenCore_NO_ACPI_Build/releases/latest" + fi + + ocdownloadurl=$(curl -L ${url} | jq -r .assets[1].browser_download_url) + curl -L ${ocdownloadurl} -o oc.zip + unzip oc.zip -d oc + + - name: OC Validate + run: | + oc/Utilities/ocvalidate/ocvalidate "EFI/OC/config.plist" || exit 1 + oc/Utilities/ocvalidate/ocvalidate "EFI/OC/config_iGPU.plist" || exit 1 + oc/Utilities/ocvalidate/ocvalidate "EFI/OC/config_RX5700XT.plist" || exit 1 + oc/Utilities/ocvalidate/ocvalidate "EFI/OC/config_RX5700XT&iGPU.plist" || exit 1 + + #- name: Delete workflow runs + # uses: Mattraks/delete-workflow-runs@v2 + # with: + # retain_days: 1 # keep_minimum_runs: 3 \ No newline at end of file diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 428d84b0..0afa3f13 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -27,13 +27,19 @@ env: jobs: build: - runs-on: macos-12 + name: macOS XCODE5 + runs-on: macos-latest + env: + JOB_TYPE: BUILD + HOMEBREW_NO_INSTALL_CLEANUP: 1 + HOMEBREW_NO_AUTO_UPDATE: 1 steps: - - uses: ruby/setup-ruby@v1 + - name: Set up Ruby + uses: ruby/setup-ruby@v1 with: ruby-version: '3.3' - - name: Set up Python 3 + - name: Set up Python uses: actions/setup-python@v5 with: python-version: '3.11' diff --git a/EFI/OC/Kexts/IntelBTPatcher.kext/Contents/Info.plist b/EFI/OC/Kexts/IntelBTPatcher.kext/Contents/Info.plist index 57af1980..6ce91c9e 100644 --- a/EFI/OC/Kexts/IntelBTPatcher.kext/Contents/Info.plist +++ b/EFI/OC/Kexts/IntelBTPatcher.kext/Contents/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 19H2026 + 23F79 CFBundleDevelopmentRegion en CFBundleExecutable @@ -17,29 +17,29 @@ CFBundlePackageType KEXT CFBundleShortVersionString - 2.4.0 + 2.5.0 CFBundleSupportedPlatforms MacOSX CFBundleVersion - 2.4.0 + 2.5.0 DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 12D4e + DTPlatformName macosx DTPlatformVersion - 11.1 + 14.0 DTSDKBuild - 20C63 + 23A334 DTSDKName - macosx11.1 + macosx14.0 DTXcode - 1240 + 1501 DTXcodeBuild - 12D4e + 15A507 IOKitPersonalities IntelBTPatcher diff --git a/EFI/OC/Kexts/IntelBTPatcher.kext/Contents/MacOS/IntelBTPatcher b/EFI/OC/Kexts/IntelBTPatcher.kext/Contents/MacOS/IntelBTPatcher index 7b725ba8..20108509 100644 Binary files a/EFI/OC/Kexts/IntelBTPatcher.kext/Contents/MacOS/IntelBTPatcher and b/EFI/OC/Kexts/IntelBTPatcher.kext/Contents/MacOS/IntelBTPatcher differ diff --git a/EFI/OC/Kexts/IntelBluetoothFirmware.kext/Contents/Info.plist b/EFI/OC/Kexts/IntelBluetoothFirmware.kext/Contents/Info.plist index b9e58193..0c15597e 100644 --- a/EFI/OC/Kexts/IntelBluetoothFirmware.kext/Contents/Info.plist +++ b/EFI/OC/Kexts/IntelBluetoothFirmware.kext/Contents/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 19H2026 + 23F79 CFBundleDevelopmentRegion en CFBundleExecutable @@ -17,29 +17,29 @@ CFBundlePackageType KEXT CFBundleShortVersionString - 2.4.0 + 2.5.0 CFBundleSupportedPlatforms MacOSX CFBundleVersion - 2.4.0 + 2.5.0 DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 12D4e + DTPlatformName macosx DTPlatformVersion - 11.1 + 14.0 DTSDKBuild - 20C63 + 23A334 DTSDKName - macosx11.1 + macosx14.0 DTXcode - 1240 + 1501 DTXcodeBuild - 12D4e + 15A507 IOKitPersonalities IntelBluetoothFirmware_0026 diff --git a/EFI/OC/Kexts/IntelBluetoothFirmware.kext/Contents/MacOS/IntelBluetoothFirmware b/EFI/OC/Kexts/IntelBluetoothFirmware.kext/Contents/MacOS/IntelBluetoothFirmware index 2b19e29a..e0c3b8d6 100644 Binary files a/EFI/OC/Kexts/IntelBluetoothFirmware.kext/Contents/MacOS/IntelBluetoothFirmware and b/EFI/OC/Kexts/IntelBluetoothFirmware.kext/Contents/MacOS/IntelBluetoothFirmware differ diff --git a/EFI/OC/Kexts/IntelBluetoothInjector.kext/Contents/Info.plist b/EFI/OC/Kexts/IntelBluetoothInjector.kext/Contents/Info.plist index 9fb74722..90e7ade6 100644 --- a/EFI/OC/Kexts/IntelBluetoothInjector.kext/Contents/Info.plist +++ b/EFI/OC/Kexts/IntelBluetoothInjector.kext/Contents/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 19H2026 + 23F79 CFBundleDevelopmentRegion en CFBundleIdentifier @@ -15,29 +15,29 @@ CFBundlePackageType KEXT CFBundleShortVersionString - 2.4.0 + 2.5.0 CFBundleSupportedPlatforms MacOSX CFBundleVersion - 2.4.0 + 2.5.0 DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 12D4e + DTPlatformName macosx DTPlatformVersion - 11.1 + 14.0 DTSDKBuild - 20C63 + 23A334 DTSDKName - macosx11.1 + macosx14.0 DTXcode - 1240 + 1501 DTXcodeBuild - 12D4e + 15A507 IOKitPersonalities 0026 diff --git a/EFI/OC/config.plist b/EFI/OC/config.plist index 318eb104..cc78b310 100644 --- a/EFI/OC/config.plist +++ b/EFI/OC/config.plist @@ -528,7 +528,7 @@ BundlePath IntelBTPatcher.kext Comment - V2.4.0 | 13 BT + V2.5.0 | 13 BT Enabled ExecutablePath @@ -564,7 +564,7 @@ BundlePath IntelBluetoothInjector.kext Comment - V2.4.0 | 11 BT + V2.5.0 | 11 BT Enabled ExecutablePath @@ -582,7 +582,7 @@ BundlePath IntelBluetoothFirmware.kext Comment - V2.4.0 | BT + V2.5.0 | BT Enabled ExecutablePath @@ -887,6 +887,14 @@ Rg== + bluetoothExternalDongleFailed + + AA== + + bluetoothInternalControllerInfo + + AAAAAAAAAAAAAAAAAAA= + boot-args -v keepsyms=1 revpatch=sbvmm shikigva=80 gfxrst=1 agdpmod=pikera csr-active-config diff --git a/EFI/OC/config_RX5700XT&iGPU.plist b/EFI/OC/config_RX5700XT&iGPU.plist index 7e795fa0..423be690 100644 --- a/EFI/OC/config_RX5700XT&iGPU.plist +++ b/EFI/OC/config_RX5700XT&iGPU.plist @@ -653,7 +653,7 @@ BundlePath IntelBTPatcher.kext Comment - V2.4.0 | 13 BT + V2.5.0 | 13 BT Enabled ExecutablePath @@ -689,7 +689,7 @@ BundlePath IntelBluetoothInjector.kext Comment - V2.4.0 | 11 BT + V2.5.0 | 11 BT Enabled ExecutablePath @@ -707,7 +707,7 @@ BundlePath IntelBluetoothFirmware.kext Comment - V2.4.0 | BT + V2.5.0 | BT Enabled ExecutablePath @@ -1012,6 +1012,14 @@ Rg== + bluetoothExternalDongleFailed + + AA== + + bluetoothInternalControllerInfo + + AAAAAAAAAAAAAAAAAAA= + boot-args -v keepsyms=1 revpatch=sbvmm shikigva=80 gfxrst=1 agdpmod=pikera csr-active-config diff --git a/EFI/OC/config_RX5700XT.plist b/EFI/OC/config_RX5700XT.plist index 08270801..bd1a84bf 100644 --- a/EFI/OC/config_RX5700XT.plist +++ b/EFI/OC/config_RX5700XT.plist @@ -625,7 +625,7 @@ BundlePath IntelBTPatcher.kext Comment - V2.4.0 | 13 BT + V2.5.0 | 13 BT Enabled ExecutablePath @@ -661,7 +661,7 @@ BundlePath IntelBluetoothInjector.kext Comment - V2.4.0 | 11 BT + V2.5.0 | 11 BT Enabled ExecutablePath @@ -679,7 +679,7 @@ BundlePath IntelBluetoothFirmware.kext Comment - V2.4.0 | BT + V2.5.0 | BT Enabled ExecutablePath @@ -984,6 +984,14 @@ Rg== + bluetoothExternalDongleFailed + + AA== + + bluetoothInternalControllerInfo + + AAAAAAAAAAAAAAAAAAA= + boot-args -v keepsyms=1 revpatch=sbvmm shikigva=80 agdpmod=pikera csr-active-config diff --git a/EFI/OC/config_iGPU.plist b/EFI/OC/config_iGPU.plist index 20a04230..d2ffbaa9 100644 --- a/EFI/OC/config_iGPU.plist +++ b/EFI/OC/config_iGPU.plist @@ -556,7 +556,7 @@ BundlePath IntelBTPatcher.kext Comment - V2.4.0 | 13 BT + V2.5.0 | 13 BT Enabled ExecutablePath @@ -592,7 +592,7 @@ BundlePath IntelBluetoothInjector.kext Comment - V2.4.0 | 11 BT + V2.5.0 | 11 BT Enabled ExecutablePath @@ -610,7 +610,7 @@ BundlePath IntelBluetoothFirmware.kext Comment - V2.4.0 | BT + V2.5.0 | BT Enabled ExecutablePath @@ -915,6 +915,14 @@ Rg== + bluetoothExternalDongleFailed + + AA== + + bluetoothInternalControllerInfo + + AAAAAAAAAAAAAAAAAAA= + boot-args -v keepsyms=1 revpatch=sbvmm shikigva=80 csr-active-config diff --git a/README.md b/README.md index 30df1c25..a289e88a 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ downloads * release: 稳定版本. * prerelease: 每天自动更新kext和OC, 可能存在未知问题. 如无必要请使用 release 版本. -* 如果需要 BigSur版本, 或者需要OC-Mod, 可参考 Custom [#25](https://github.com/wjz304/Hackintosh-EFI-MSI-Z490i-Unify/issues/34) 自动构建打包. +* 如果需要OC-Mod, 可参考 Custom [#25](https://github.com/wjz304/Hackintosh-EFI-MSI-Z490i-Unify/issues/34) 自动构建打包. ## 配置 规格 | 详细信息 diff --git a/update.py b/update.py index 25663b34..f64a638a 100644 --- a/update.py +++ b/update.py @@ -295,6 +295,7 @@ def upgradeItlwm(self, itver = ['sequoia', 'sonoma', 'ventura', 'monterey']): break def upgradeIBT(self): + return 0 # Disable upgrade IBT print('upgrade {}'.format('IntelBluetoothFirmware and IntelBluetoothInjector')) res = self.PM.request('GET', 'https://api.github.com/repos/OpenIntelWireless/IntelBluetoothFirmware/releases') self.ibt = json.loads(res.data.decode('utf-8'))