Skip to content

Commit

Permalink
CI: Remove CPV check
Browse files Browse the repository at this point in the history
* download_kext.sh: Use Sniki's CodecCommander
* OC: Update config to support acidanthera/OpenCorePkg@985b24d
  • Loading branch information
stevezhengshiqi committed May 17, 2021
1 parent 09d7867 commit 992184e
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 34 deletions.
22 changes: 0 additions & 22 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,28 +80,6 @@ jobs:
run: |
find . -name '*.dsl' -exec sh -c './iasl* -vw 2095 -vw 2173 -vs -p "${1%/*}/../${1##*/}" "${1%}" && echo || exit 1' sh {} \;
analyze-clover-config:
name: Analyze Clover Configs
runs-on: macos-latest
steps:
- uses: actions/checkout@v2

- name: Install Dependency
run: |
mkdir "CloverConfigPlistValidator" && cd "CloverConfigPlistValidator" || exit 1
hg="grep -m 1 CloverConfigPlistValidator"
rawURL="https://github.com/CloverHackyColor/CloverBootloader/releases/latest"
url="https://github.com$(curl -L --silent "${rawURL}" | grep '/download/' | eval "${hg}" | sed 's/^[^"]*"\([^"]*\)".*/\1/')"
echo "Downloading ${url##*\/}"
curl -# -L -O "${url}" || exit 1
unzip -qq "*.zip" || exit 1
chmod +x CloverConfigPlistValidator || exit 1
- name: Run CloverConfigPlistValidator
run: |
./CloverConfigPlistValidator/CloverConfigPlistValidator ./CLOVER/config_kbl.plist || exit 1
./CloverConfigPlistValidator/CloverConfigPlistValidator ./CLOVER/config_cml.plist || exit 1
analyze-oc-config:
name: Analyze OpenCore Configs
runs-on: macos-latest
Expand Down
2 changes: 1 addition & 1 deletion CLOVER/config_cml.plist
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@
<key>SystemParameters</key>
<dict>
<key>InjectKexts</key>
<string>Yes</string>
<true/>
<key>InjectSystemID</key>
<true/>
</dict>
Expand Down
2 changes: 2 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
- Update `Clover` r5135
- Update `AppleALC` v1.6.1
- Update `VirtualSMC` v1.2.4
- Update `AirportItlwm` v2.0.0 (up to )
- Update `IntelBluetoothFirmware` v1.1.3 (up to )
- Update `RestrictEvents` v1.0.2
- Update `ExFatDxe.efi` (up to [acidanthera/OcBinaryData@95b7d4c](https://github.com/acidanthera/OcBinaryData/commit/95b7d4ccb9fea6af48641fc1f5bd4b57f747b235))
- Update `HfsPlus.efi` (up to [acidanthera/OcBinaryData@95b7d4c](https://github.com/acidanthera/OcBinaryData/commit/95b7d4ccb9fea6af48641fc1f5bd4b57f747b235))
Expand Down
2 changes: 2 additions & 0 deletions Docs/Changelog_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
* 更新 `Clover` r5135
* 更新 `AppleALC` v1.6.1
* 更新 `VirtualSMC` v1.2.4
* 更新 `AirportItlwm` v2.0.0(更新至)
* 更新 `IntelBluetoothFirmware` v1.1.3(更新至)
* 更新 `RestrictEvents` v1.0.2
* 更新 `ExFatDxe.efi`(更新至 [acidanthera/OcBinaryData@95b7d4c](https://github.com/acidanthera/OcBinaryData/commit/95b7d4ccb9fea6af48641fc1f5bd4b57f747b235)
* 更新 `HfsPlus.efi`(更新至 [acidanthera/OcBinaryData@95b7d4c](https://github.com/acidanthera/OcBinaryData/commit/95b7d4ccb9fea6af48641fc1f5bd4b57f747b235)
Expand Down
15 changes: 6 additions & 9 deletions Kexts/download_kexts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ function init() {
function h_or_g() {
if [[ "$1" == "VoodooI2C" ]]; then
hgs=( "head -n 1" )
elif [[ "$1" == "EAPD-Codec-Commander" ]]; then
hgs=( "grep -m 2 CodecCommander | grep -m 1 RELEASE" )
elif [[ "$1" == "IntelBluetoothFirmware" ]]; then
hgs=( "grep -m 1 IntelBluetooth" )
elif [[ "$1" == "itlwm" ]]; then
Expand Down Expand Up @@ -180,11 +182,6 @@ function dBR() {
}

function download() {
local rmKexts=(
os-x-eapd-codec-commander
os-x-null-ethernet
)

local acdtKexts=(
VirtualSMC
WhateverGreen
Expand All @@ -200,9 +197,7 @@ function download() {
itlwm
)

for rmKext in "${rmKexts[@]}"; do
dBR Rehabman "${rmKext}" "${OUTDir_TMP}"
done
dBR Rehabman os-x-null-ethernet "${OUTDir_TMP}"

for acdtKext in "${acdtKexts[@]}"; do
dGR ${ACDT} "${acdtKext}" NULL "${OUTDir_TMP}"
Expand All @@ -212,6 +207,8 @@ function download() {
dGR ${OIW} "${oiwKext}" PreRelease "${OUTDir_TMP}"
done

dGR Sniki EAPD-Codec-Commander NULL "${OUTDir_TMP}"

dGR VoodooI2C VoodooI2C NULL "${OUTDir_TMP}"

dGR al3xtjames NoTouchID NULL "${OUTDir_TMP}"
Expand All @@ -231,7 +228,7 @@ function patch() {
local unusedItems=(
"HibernationFixup.kext/Contents/_CodeSignature"
"Kexts/SMCBatteryManager.kext/Contents/Resources"
"Release/CodecCommander.kext/Contents/Resources"
"CodecCommander.kext/Contents/Resources"
"RestrictEvents.kext/Contents/_CodeSignature"
"VoodooI2C.kext/Contents/PlugIns/VoodooInput.kext.dSYM"
"VoodooI2C.kext/Contents/PlugIns/VoodooInput.kext/Contents/_CodeSignature"
Expand Down
2 changes: 1 addition & 1 deletion OC/config_cml.plist
Original file line number Diff line number Diff line change
Expand Up @@ -1066,7 +1066,7 @@
<key>PickerMode</key>
<string>External</string>
<key>PickerVariant</key>
<string>Modern</string>
<string>Default</string>
<key>PollAppleHotKeys</key>
<true/>
<key>ShowPicker</key>
Expand Down
2 changes: 1 addition & 1 deletion OC/config_kbl.plist
Original file line number Diff line number Diff line change
Expand Up @@ -1121,7 +1121,7 @@
<key>PickerMode</key>
<string>External</string>
<key>PickerVariant</key>
<string>Modern</string>
<string>Default</string>
<key>PollAppleHotKeys</key>
<true/>
<key>ShowPicker</key>
Expand Down

0 comments on commit 992184e

Please sign in to comment.