Skip to content

Commit

Permalink
更新 macOS 工作流和 Kexts 版本
Browse files Browse the repository at this point in the history
  • Loading branch information
wjz304 committed Nov 19, 2024
1 parent 43638af commit 76a4717
Show file tree
Hide file tree
Showing 14 changed files with 166 additions and 106 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/custom.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
135 changes: 75 additions & 60 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -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/[email protected]
# 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/[email protected]
# 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
12 changes: 9 additions & 3 deletions .github/workflows/update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
18 changes: 9 additions & 9 deletions EFI/OC/Kexts/IntelBTPatcher.kext/Contents/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>19H2026</string>
<string>23F79</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand All @@ -17,29 +17,29 @@
<key>CFBundlePackageType</key>
<string>KEXT</string>
<key>CFBundleShortVersionString</key>
<string>2.4.0</string>
<string>2.5.0</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
<key>CFBundleVersion</key>
<string>2.4.0</string>
<string>2.5.0</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>12D4e</string>
<string></string>
<key>DTPlatformName</key>
<string>macosx</string>
<key>DTPlatformVersion</key>
<string>11.1</string>
<string>14.0</string>
<key>DTSDKBuild</key>
<string>20C63</string>
<string>23A334</string>
<key>DTSDKName</key>
<string>macosx11.1</string>
<string>macosx14.0</string>
<key>DTXcode</key>
<string>1240</string>
<string>1501</string>
<key>DTXcodeBuild</key>
<string>12D4e</string>
<string>15A507</string>
<key>IOKitPersonalities</key>
<dict>
<key>IntelBTPatcher</key>
Expand Down
Binary file modified EFI/OC/Kexts/IntelBTPatcher.kext/Contents/MacOS/IntelBTPatcher
Binary file not shown.
18 changes: 9 additions & 9 deletions EFI/OC/Kexts/IntelBluetoothFirmware.kext/Contents/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>19H2026</string>
<string>23F79</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand All @@ -17,29 +17,29 @@
<key>CFBundlePackageType</key>
<string>KEXT</string>
<key>CFBundleShortVersionString</key>
<string>2.4.0</string>
<string>2.5.0</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
<key>CFBundleVersion</key>
<string>2.4.0</string>
<string>2.5.0</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>12D4e</string>
<string></string>
<key>DTPlatformName</key>
<string>macosx</string>
<key>DTPlatformVersion</key>
<string>11.1</string>
<string>14.0</string>
<key>DTSDKBuild</key>
<string>20C63</string>
<string>23A334</string>
<key>DTSDKName</key>
<string>macosx11.1</string>
<string>macosx14.0</string>
<key>DTXcode</key>
<string>1240</string>
<string>1501</string>
<key>DTXcodeBuild</key>
<string>12D4e</string>
<string>15A507</string>
<key>IOKitPersonalities</key>
<dict>
<key>IntelBluetoothFirmware_0026</key>
Expand Down
Binary file not shown.
18 changes: 9 additions & 9 deletions EFI/OC/Kexts/IntelBluetoothInjector.kext/Contents/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>19H2026</string>
<string>23F79</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleIdentifier</key>
Expand All @@ -15,29 +15,29 @@
<key>CFBundlePackageType</key>
<string>KEXT</string>
<key>CFBundleShortVersionString</key>
<string>2.4.0</string>
<string>2.5.0</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
<key>CFBundleVersion</key>
<string>2.4.0</string>
<string>2.5.0</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>12D4e</string>
<string></string>
<key>DTPlatformName</key>
<string>macosx</string>
<key>DTPlatformVersion</key>
<string>11.1</string>
<string>14.0</string>
<key>DTSDKBuild</key>
<string>20C63</string>
<string>23A334</string>
<key>DTSDKName</key>
<string>macosx11.1</string>
<string>macosx14.0</string>
<key>DTXcode</key>
<string>1240</string>
<string>1501</string>
<key>DTXcodeBuild</key>
<string>12D4e</string>
<string>15A507</string>
<key>IOKitPersonalities</key>
<dict>
<key>0026</key>
Expand Down
14 changes: 11 additions & 3 deletions EFI/OC/config.plist
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@
<key>BundlePath</key>
<string>IntelBTPatcher.kext</string>
<key>Comment</key>
<string>V2.4.0 | 13 BT</string>
<string>V2.5.0 | 13 BT</string>
<key>Enabled</key>
<true/>
<key>ExecutablePath</key>
Expand Down Expand Up @@ -564,7 +564,7 @@
<key>BundlePath</key>
<string>IntelBluetoothInjector.kext</string>
<key>Comment</key>
<string>V2.4.0 | 11 BT</string>
<string>V2.5.0 | 11 BT</string>
<key>Enabled</key>
<true/>
<key>ExecutablePath</key>
Expand All @@ -582,7 +582,7 @@
<key>BundlePath</key>
<string>IntelBluetoothFirmware.kext</string>
<key>Comment</key>
<string>V2.4.0 | BT</string>
<string>V2.5.0 | BT</string>
<key>Enabled</key>
<true/>
<key>ExecutablePath</key>
Expand Down Expand Up @@ -887,6 +887,14 @@
<data>
Rg==
</data>
<key>bluetoothExternalDongleFailed</key>
<data>
AA==
</data>
<key>bluetoothInternalControllerInfo</key>
<data>
AAAAAAAAAAAAAAAAAAA=
</data>
<key>boot-args</key>
<string>-v keepsyms=1 revpatch=sbvmm shikigva=80 gfxrst=1 agdpmod=pikera</string>
<key>csr-active-config</key>
Expand Down
Loading

0 comments on commit 76a4717

Please sign in to comment.