Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-11-27 12:15:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #399 from stevezhengshiqi/master

Browse Source 
CI: Adapt new buildme and Remove Upload to Release stage
This commit is contained in:
jief666 2021-05-24 12:11:00 +03:00 committed by GitHub
commit 8b2af7e287
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 114 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.github/workflows/main.yml vendored
View File

@ -30,7 +30,9 @@ jobs:
HOMEBREW_NO_AUTO_UPDATE: 1 HOMEBREW_NO_AUTO_UPDATE: 1
- name: Build Clover Pack - name: Build Clover Pack
run: ./buildme "" ci run: |
chmod +x ./buildme
./buildme "" ci
- name: Prepare Release Packs - name: Prepare Release Packs
run: | run: |
@ -58,13 +60,13 @@ jobs:
CLOVERX64.efi.zip CLOVERX64.efi.zip
Clover_r*.pkg Clover_r*.pkg
- name: Upload to Release # - name: Upload to Release
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') # if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
uses: ncipollo/release-action@v1 # uses: ncipollo/release-action@v1
with: # with:
artifacts: ./*.7z, ./Clover.app*.pkg, ./CloverV2*.zip, ./CLOVERX64.efi.zip, ./Clover_r*.pkg # artifacts: ./*.7z, ./Clover.app*.pkg, ./CloverV2*.zip, ./CLOVERX64.efi.zip, ./Clover_r*.pkg
bodyFile: ReleaseNotes.md # bodyFile: ReleaseNotes.md
name: Release v5.1 r${{ env.CUR_TAG }} # name: Release v5.1 r${{ env.CUR_TAG }}
prerelease: false # prerelease: false
tag: ${{ env.CUR_TAG }} # tag: ${{ env.CUR_TAG }}
token: ${{ secrets.GITHUB_TOKEN }} # token: ${{ secrets.GITHUB_TOKEN }}

3
.gitignore vendored
View File

@ -57,5 +57,4 @@ RELEASE_*/
*copy [0-9]* *copy [0-9]*
#work in progress #work in progress
*_wip *_wip

200
buildme
View File

@ -154,7 +154,7 @@ make
BLC() { BLC() {
if [[ ! -d "${CLOVERROOT}"/CloverPackage/BootLoaderChooser ]]; then if [[ ! -d "${CLOVERROOT}"/CloverPackage/BootLoaderChooser ]]; then
mkdir -p "${CLOVERROOT}"/CloverPackage/BootLoaderChooser mkdir -p "${CLOVERROOT}"/CloverPackage/BootLoaderChooser
fi fi
curl -sLq https://github.com/jief666/BootloaderChooser/releases/download/0.5/BootX64.efi > "${CLOVERROOT}"/CloverPackage/BootLoaderChooser/BootX64.efi curl -sLq https://github.com/jief666/BootloaderChooser/releases/download/0.5/BootX64.efi > "${CLOVERROOT}"/CloverPackage/BootLoaderChooser/BootX64.efi
chmod 775 "${CLOVERROOT}"/CloverPackage/BootLoaderChooser/BootX64.efi chmod 775 "${CLOVERROOT}"/CloverPackage/BootLoaderChooser/BootX64.efi
@ -317,7 +317,7 @@ make clean
buildCPV() { buildCPV() {
revision=r$(git describe --tags $(git rev-list --tags --max-count=1)) revision=r$(git describe --tags $(git rev-list --tags --max-count=1))
if [[ -d "${CLOVERROOT}"/CloverPackage/CloverConfigPlistValidator ]]; then if [[ -d "${CLOVERROOT}"/CloverPackage/CloverConfigPlistValidator ]]; then
rm -Rf "${CLOVERROOT}"/CloverPackage/CloverConfigPlistValidator rm -Rf "${CLOVERROOT}"/CloverPackage/CloverConfigPlistValidator
fi fi
mkdir -p "${CLOVERROOT}"/CloverPackage/CloverConfigPlistValidator mkdir -p "${CLOVERROOT}"/CloverPackage/CloverConfigPlistValidator
cd "${CLOVERROOT}"/Xcode/CloverConfigPlistValidator cd "${CLOVERROOT}"/Xcode/CloverConfigPlistValidator
@ -330,108 +330,107 @@ open "${CLOVERROOT}"/CloverPackage/CloverConfigPlistValidator
PlistEDPlus() { PlistEDPlus() {
if [[ ! -d $HOME/Desktop/ClovUtils ]]; then if [[ ! -d $HOME/Desktop/ClovUtils ]]; then
mkdir -p $HOME/Desktop/ClovUtils mkdir -p $HOME/Desktop/ClovUtils
fi fi
cd $HOME/Desktop/ClovUtils && curl -qsSLk https://github.com/ic005k/PlistEDPlus/releases/download/1.0.52/PlistEDPlus_Mac.dmg > PlistEDPlus_Mac.dmg cd $HOME/Desktop/ClovUtils && curl -qsSLk https://github.com/ic005k/PlistEDPlus/releases/download/1.0.52/PlistEDPlus_Mac.dmg > PlistEDPlus_Mac.dmg
hdiutil attach -quiet -noverify -nobrowse PlistEDPlus_Mac.dmg && cp -Rf /Volumes/bin\:release\:PlistEDPlus/PlistEDPlus.app $HOME/Desktop/ClovUtils hdiutil attach -quiet -noverify -nobrowse PlistEDPlus_Mac.dmg && cp -Rf /Volumes/bin\:release\:PlistEDPlus/PlistEDPlus.app $HOME/Desktop/ClovUtils
hdiutil detach -force /Volumes/bin\:release\:PlistEDPlus hdiutil detach -force /Volumes/bin\:release\:PlistEDPlus
rm -r $HOME/Desktop/ClovUtils/PlistEDPlus_Mac.dmg && open $HOME/Desktop/ClovUtils rm -r $HOME/Desktop/ClovUtils/PlistEDPlus_Mac.dmg && open $HOME/Desktop/ClovUtils
} }
Hackintool() { Hackintool() {
if [[ ! -d $HOME/Desktop/ClovUtils ]]; then if [[ ! -d $HOME/Desktop/ClovUtils ]]; then
mkdir -p $HOME/Desktop/ClovUtils mkdir -p $HOME/Desktop/ClovUtils
fi fi
cd $HOME/Desktop/ClovUtils && curl -sLq https://github.com/headkaze/Hackintool/releases/download/3.5.2/Hackintool.zip -o Hackintool.zip cd $HOME/Desktop/ClovUtils && curl -sLq https://github.com/headkaze/Hackintool/releases/download/3.5.2/Hackintool.zip -o Hackintool.zip
unzip -q Hackintool.zip && rm -r Hackintool.zip && open $HOME/Desktop/ClovUtils unzip -q Hackintool.zip && rm -r Hackintool.zip && open $HOME/Desktop/ClovUtils
} }
BitmaskDecode() { BitmaskDecode() {
if [[ ! -d $HOME/Desktop/ClovUtils ]]; then if [[ ! -d $HOME/Desktop/ClovUtils ]]; then
mkdir -p $HOME/Desktop/ClovUtils mkdir -p $HOME/Desktop/ClovUtils
fi fi
cd $HOME/Desktop/ClovUtils && git clone -q https://github.com/corpnewt/BitmaskDecode && open $HOME/Desktop/ClovUtils cd $HOME/Desktop/ClovUtils && git clone -q https://github.com/corpnewt/BitmaskDecode && open $HOME/Desktop/ClovUtils
} }
MaciASL() { MaciASL() {
if [[ ! -d $HOME/Desktop/ClovUtils ]]; then if [[ ! -d $HOME/Desktop/ClovUtils ]]; then
mkdir -p $HOME/Desktop/ClovUtils mkdir -p $HOME/Desktop/ClovUtils
fi fi
cd $HOME/Desktop/ClovUtils && curl -sLq https://github.com/acidanthera/MaciASL/releases/download/1.6.1/MaciASL-1.6.1-RELEASE.dmg > MaciASL-1.6.1-RELEASE.dmg cd $HOME/Desktop/ClovUtils && curl -sLq https://github.com/acidanthera/MaciASL/releases/download/1.6.1/MaciASL-1.6.1-RELEASE.dmg > MaciASL-1.6.1-RELEASE.dmg
hdiutil attach -quiet -noverify -nobrowse MaciASL-1.6.1-RELEASE.dmg && cp -Rf /Volumes/MaciASL/MaciASL.app $HOME/Desktop/ClovUtils hdiutil attach -quiet -noverify -nobrowse MaciASL-1.6.1-RELEASE.dmg && cp -Rf /Volumes/MaciASL/MaciASL.app $HOME/Desktop/ClovUtils
hdiutil detach -force /Volumes/MaciASL hdiutil detach -force /Volumes/MaciASL
rm -r $HOME/Desktop/ClovUtils/MaciASL-1.6.1-RELEASE.dmg && open $HOME/Desktop/ClovUtils rm -r $HOME/Desktop/ClovUtils/MaciASL-1.6.1-RELEASE.dmg && open $HOME/Desktop/ClovUtils
} }
dmidecode() { dmidecode() {
if [[ ! -d $HOME/Desktop/ClovUtils ]]; then if [[ ! -d $HOME/Desktop/ClovUtils ]]; then
mkdir -p $HOME/Desktop/ClovUtils/dmidecode mkdir -p $HOME/Desktop/ClovUtils/dmidecode
fi fi
cd $HOME/Desktop/ClovUtils && git clone -q https://github.com/acidanthera/dmidecode dmi-decode && xcodebuild -project ./dmi-decode/dmidecode.xcodeproj -quiet cd $HOME/Desktop/ClovUtils && git clone -q https://github.com/acidanthera/dmidecode dmi-decode && xcodebuild -project ./dmi-decode/dmidecode.xcodeproj -quiet
cp -r dmi-decode/dmidecode $HOME/Desktop/ClovUtils/dmidecode && rm -Rf $HOME/Desktop/ClovUtils/dmi-decode && open $HOME/Desktop/ClovUtils cp -r dmi-decode/dmidecode $HOME/Desktop/ClovUtils/dmidecode && rm -Rf $HOME/Desktop/ClovUtils/dmi-decode && open $HOME/Desktop/ClovUtils
} }
Get-IOReg-Devices() { Get-IOReg-Devices() {
if [[ ! -d $HOME/Desktop/ClovUtils ]]; then if [[ ! -d $HOME/Desktop/ClovUtils ]]; then
mkdir -p $HOME/Desktop/ClovUtils mkdir -p $HOME/Desktop/ClovUtils
fi fi
cd $HOME/Desktop/ClovUtils && git clone -q https://github.com/LAbyOne/Get-IOReg-Devices cd $HOME/Desktop/ClovUtils && git clone -q https://github.com/LAbyOne/Get-IOReg-Devices
mv -f Get-IOReg-Devices/Get\ IOReg\ Devices $HOME/Desktop/ClovUtils/Get\ IOReg-Devices && chmod a+x $HOME/Desktop/ClovUtils/Get\ IOReg-Devices/*.command mv -f Get-IOReg-Devices/Get\ IOReg\ Devices $HOME/Desktop/ClovUtils/Get\ IOReg-Devices && chmod a+x $HOME/Desktop/ClovUtils/Get\ IOReg-Devices/*.command
rm -rf Get-IOReg-Devices && open $HOME/Desktop/ClovUtils rm -rf Get-IOReg-Devices && open $HOME/Desktop/ClovUtils
} }
NDBrightness () { NDBrightness () {
if [[ ! -d $HOME/Desktop/ClovUtils ]]; then if [[ ! -d $HOME/Desktop/ClovUtils ]]; then
mkdir -p $HOME/Desktop/ClovUtils mkdir -p $HOME/Desktop/ClovUtils
fi fi
cd $HOME/Desktop/ClovUtils && git clone -q https://github.com/KAMIKAZEUA/NativeDisplayBrightness NDBrightness cd $HOME/Desktop/ClovUtils && git clone -q https://github.com/KAMIKAZEUA/NativeDisplayBrightness NDBrightness
xcodebuild -project ./NDBrightness/NativeDisplayBrightness.xcodeproj -quiet -configuration Release clean build ARCHS=x86_64 ONLY_ACTIVE_ARCH=YES CONFIGURATION_BUILD_DIR=$HOME/Desktop/ClovUtils xcodebuild -project ./NDBrightness/NativeDisplayBrightness.xcodeproj -quiet -configuration Release clean build ARCHS=x86_64 ONLY_ACTIVE_ARCH=YES CONFIGURATION_BUILD_DIR=$HOME/Desktop/ClovUtils
rm -Rf $HOME/Desktop/ClovUtils/NDBrightness && rm -r $HOME/Desktop/ClovUtils/*.dSYM && open $HOME/Desktop/ClovUtils rm -Rf $HOME/Desktop/ClovUtils/NDBrightness && rm -r $HOME/Desktop/ClovUtils/*.dSYM && open $HOME/Desktop/ClovUtils
} }
SSDTTime() { SSDTTime() {
if [[ ! -d $HOME/Desktop/ClovUtils ]]; then if [[ ! -d $HOME/Desktop/ClovUtils ]]; then
mkdir -p $HOME/Desktop/ClovUtils mkdir -p $HOME/Desktop/ClovUtils
fi fi
cd $HOME/Desktop/ClovUtils && git clone -q https://github.com/corpnewt/SSDTTime && open $HOME/Desktop/ClovUtils cd $HOME/Desktop/ClovUtils && git clone -q https://github.com/corpnewt/SSDTTime && open $HOME/Desktop/ClovUtils
} }
USBMap() { USBMap() {
if [[ ! -d $HOME/Desktop/ClovUtils ]]; then if [[ ! -d $HOME/Desktop/ClovUtils ]]; then
mkdir -p $HOME/Desktop/ClovUtils mkdir -p $HOME/Desktop/ClovUtils
fi fi
cd $HOME/Desktop/ClovUtils && git clone -q https://github.com/corpnewt/USBMap cd $HOME/Desktop/ClovUtils && git clone -q https://github.com/corpnewt/USBMap
open $HOME/Desktop/ClovUtils open $HOME/Desktop/ClovUtils
} }
QtiASL() { QtiASL() {
if [[ ! -d $HOME/Desktop/ClovUtils ]]; then if [[ ! -d $HOME/Desktop/ClovUtils ]]; then
mkdir -p $HOME/Desktop/ClovUtils mkdir -p $HOME/Desktop/ClovUtils
fi fi
cd $HOME/Desktop/ClovUtils && curl -sLq https://github.com/ic005k/QtiASL/releases/download/1.0.60/QtiASL_Mac.dmg > QtiASL_Mac.dmg cd $HOME/Desktop/ClovUtils && curl -sLq https://github.com/ic005k/QtiASL/releases/download/1.0.60/QtiASL_Mac.dmg > QtiASL_Mac.dmg
hdiutil attach -quiet -noverify -nobrowse QtiASL_Mac.dmg && cp -Rf /Volumes/bin\:release\:QtiASL/QtiASL.app $HOME/Desktop/ClovUtils hdiutil attach -quiet -noverify -nobrowse QtiASL_Mac.dmg && cp -Rf /Volumes/bin\:release\:QtiASL/QtiASL.app $HOME/Desktop/ClovUtils
hdiutil detach -force /Volumes/bin\:release\:QtiASL hdiutil detach -force /Volumes/bin\:release\:QtiASL
rm -r $HOME/Desktop/ClovUtils/QtiASL_Mac.dmg && open $HOME/Desktop/ClovUtils rm -r $HOME/Desktop/ClovUtils/QtiASL_Mac.dmg && open $HOME/Desktop/ClovUtils
} }
CsrDecode() { CsrDecode() {
if [[ ! -d $HOME/Desktop/ClovUtils ]]; then if [[ ! -d $HOME/Desktop/ClovUtils ]]; then
mkdir -p $HOME/Desktop/ClovUtils/CsrDecode mkdir -p $HOME/Desktop/ClovUtils/CsrDecode
fi fi
cd $HOME/Desktop/ClovUtils && git clone -q https://github.com/corpnewt/CsrDecode && open $HOME/Desktop/ClovUtils cd $HOME/Desktop/ClovUtils && git clone -q https://github.com/corpnewt/CsrDecode && open $HOME/Desktop/ClovUtils
} }
gibMacOS() { gibMacOS() {
if [[ ! -d $HOME/Desktop/ClovUtils ]]; then if [[ ! -d $HOME/Desktop/ClovUtils ]]; then
mkdir -p $HOME/Desktop/ClovUtils mkdir -p $HOME/Desktop/ClovUtils
fi fi
cd $HOME/Desktop/ClovUtils && git clone -q https://github.com/corpnewt/gibMacOS && open $HOME/Desktop/ClovUtils cd $HOME/Desktop/ClovUtils && git clone -q https://github.com/corpnewt/gibMacOS && open $HOME/Desktop/ClovUtils
} }
testing() { testing() {
clear clear
echo echo
echo -e $COL_GREEN"-----------------------------------------------------------"$COL_RESET echo -e $COL_GREEN"-----------------------------------------------------------"$COL_RESET
cd "${CLOVERROOT}" cd "${CLOVERROOT}"
@ -448,75 +447,75 @@ PS3='
Please enter your choice: ' Please enter your choice: '
options=( 'test Clover with boot6' options=( 'test Clover with boot6'
'test Clover with boot7' 'test Clover with boot7'
'test build (no autogen, no boot files)' 'test build (no autogen, no boot files)'
'back to buildme' 'back to buildme'
'quit') 'quit')
select opt in "${options[@]}" select opt in "${options[@]}"
do do
case $opt in case $opt in
"test Clover with boot6") "test Clover with boot6")
buildtestsix buildtestsix
break break
;; ;;
"test Clover with boot7") "test Clover with boot7")
buildtestsev buildtestsev
break break
;; ;;
"test build (no autogen, no boot files)") "test build (no autogen, no boot files)")
Hackintool Hackintool
break break
;; ;;
"Get BitmaskDecode") "Get BitmaskDecode")
BitmaskDecode BitmaskDecode
break break
;; ;;
"Get MaciASL") "Get MaciASL")
MaciASL MaciASL
break break
;; ;;
"Get dmidecode") "Get dmidecode")
dmidecode dmidecode
break break
;; ;;
"Get IOReg-Devices") "Get IOReg-Devices")
Get-IOReg-Devices Get-IOReg-Devices
break break
;; ;;
"Get NativeDisplayBrightness") "Get NativeDisplayBrightness")
NDBrightness NDBrightness
break break
;; ;;
"Get SSDTTime") "Get SSDTTime")
SSDTTime SSDTTime
break break
;; ;;
"Get USBMap") "Get USBMap")
USBMap USBMap
break break
;; ;;
"Get QtiASL") "Get QtiASL")
QtiASL QtiASL
break break
;; ;;
"Get CsrDecode") "Get CsrDecode")
CsrDecode CsrDecode
break break
;; ;;
"Get gibMacOS") "Get gibMacOS")
gibMacOS gibMacOS
break break
;; ;;
"back to buildme") "back to buildme")
menu menu
break break
;; ;;
"quit") "quit")
exit exit
break break
;; ;;
*) *)
echo "invalid option $REPLY" echo "invalid option $REPLY"
break break
;; ;;
esac esac
done done
@ -540,84 +539,84 @@ PS3='
Files will be put on Desktop/ClovUtils: ' Files will be put on Desktop/ClovUtils: '
options=( 'Get CloverConfigPlistValidator' options=( 'Get CloverConfigPlistValidator'
'Get PlistEDPlus' 'Get PlistEDPlus'
'Get Hackintool' 'Get Hackintool'
'Get BitmaskDecode' 'Get BitmaskDecode'
'Get MaciASL' 'Get MaciASL'
'Get dmidecode' 'Get dmidecode'
'Get IOReg-Devices' 'Get IOReg-Devices'
'Get NativeDisplayBrightness' 'Get NativeDisplayBrightness'
'Get SSDTTime' 'Get SSDTTime'
'Get USBMap' 'Get USBMap'
'Get QtiASL' 'Get QtiASL'
'Get CsrDecode' 'Get CsrDecode'
'Get gibMacOS' 'Get gibMacOS'
'back to buildme' 'back to buildme'
'quit') 'quit')
select opt in "${options[@]}" select opt in "${options[@]}"
do do
case $opt in case $opt in
"Get CloverConfigPlistValidator") "Get CloverConfigPlistValidator")
buildCPV buildCPV
break break
;; ;;
"Get PlistEDPlus") "Get PlistEDPlus")
PlistEDPlus PlistEDPlus
break break
;; ;;
"Get Hackintool") "Get Hackintool")
Hackintool Hackintool
break break
;; ;;
"Get BitmaskDecode") "Get BitmaskDecode")
BitmaskDecode BitmaskDecode
break break
;; ;;
"Get MaciASL") "Get MaciASL")
MaciASL MaciASL
break break
;; ;;
"Get dmidecode") "Get dmidecode")
dmidecode dmidecode
break break
;; ;;
"Get IOReg-Devices") "Get IOReg-Devices")
Get-IOReg-Devices Get-IOReg-Devices
break break
;; ;;
"Get NativeDisplayBrightness") "Get NativeDisplayBrightness")
NDBrightness NDBrightness
break break
;; ;;
"Get SSDTTime") "Get SSDTTime")
SSDTTime SSDTTime
break break
;; ;;
"Get USBMap") "Get USBMap")
USBMap USBMap
break break
;; ;;
"Get QtiASL") "Get QtiASL")
QtiASL QtiASL
break break
;; ;;
"Get CsrDecode") "Get CsrDecode")
CsrDecode CsrDecode
break break
;; ;;
"Get gibMacOS") "Get gibMacOS")
gibMacOS gibMacOS
break break
;; ;;
"back to buildme") "back to buildme")
menu menu
break break
;; ;;
"quit") "quit")
exit exit
break break
;; ;;
*) *)
echo "invalid option $REPLY" echo "invalid option $REPLY"
break break
;; ;;
esac esac
@ -650,7 +649,7 @@ options=( 'build Clover'
'make app (with Clover)' 'make app (with Clover)'
'make iso' 'make iso'
'build all' 'build all'
'test Clover' 'test Clover'
'status' 'status'
'show diff' 'show diff'
'open CloverV2/EFI/CLOVER directory' 'open CloverV2/EFI/CLOVER directory'
@ -675,9 +674,9 @@ do
break break
;; ;;
"make pkg") "make pkg")
buildCCPV buildCCPV
BLC BLC
buildPkg buildPkg
break break
;; ;;
"make app") "make app")
@ -694,8 +693,8 @@ do
;; ;;
"build all") "build all")
buildClover buildClover
buildCCPV buildCCPV
BLC BLC
buildPkg buildPkg
buildIso buildIso
buildApp buildApp
@ -729,7 +728,7 @@ do
updateResetClover updateResetClover
fi fi
break break
;; ;;
"clean BaseTools") "clean BaseTools")
read -p "Are you sure? (type y to confirm or any other to negate) " -n 1 -r read -p "Are you sure? (type y to confirm or any other to negate) " -n 1 -r
echo echo
@ -739,7 +738,7 @@ do
break break
;; ;;
"Utilities") "Utilities")
Utilities Utilities
break break
;; ;;
"quit") "quit")
@ -758,10 +757,11 @@ menu
set -e set -e
if [[ "$2" == ci ]]; then if [[ "$2" == ci ]]; then
buildClover buildClover
buildCCPV
BLC
buildPkg buildPkg
buildIso buildIso
buildApp buildApp
buildCPV
else else
menu menu
fi fi