Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ppsspp(-dev): Fix manifests, Update test.ps1 to Pester 5 #745

Merged
merged 7 commits into from
Dec 23, 2022
Merged

ppsspp(-dev): Fix manifests, Update test.ps1 to Pester 5 #745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a3338dd
Update test.ps1 to Pester 5
sitiom Nov 18, 2022
e345dc1
ppsspp(-dev): fix manifests, add arm64 arch
sitiom Nov 18, 2022
25c3601
Update ppsspp(-dev) manifests
sitiom Dec 22, 2022
928b114
Merge branch 'master' into patch-1
sitiom Dec 22, 2022
b407b84
Merge branch 'master' into patch-1
sitiom Dec 23, 2022
54ba0d5
Merge branch 'master' into patch-1
Calinou Dec 23, 2022
8e5d4cf
Update ppsspp-dev manifest
sitiom Dec 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions bin/test.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
#Requires -Modules @{ ModuleName = 'Pester'; MaximumVersion = '4.99' }
#Requires -Version 5.1
#Requires -Modules @{ ModuleName = 'BuildHelpers'; ModuleVersion = '2.0.1' }
#Requires -Modules @{ ModuleName = 'Pester'; ModuleVersion = '5.2.0' }

if(!$env:SCOOP_HOME) { $env:SCOOP_HOME = Convert-Path (scoop prefix scoop) }
$result = Invoke-Pester "$PSScriptRoot\.." -PassThru
$pesterConfig = New-PesterConfiguration -Hashtable @{
Run = @{
Path = "$PSScriptRoot/.."
PassThru = $true
}
Output = @{
Verbosity = 'Detailed'
}
}
$result = Invoke-Pester -Configuration $pesterConfig
exit $result.FailedCount
45 changes: 21 additions & 24 deletions bucket/ppsspp-dev.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,38 @@
{
"version": "1.14.1-27",
"description": "Sony PSP emulator (Development)",
"version": "1.14.1-26-gc730ba765",
"description": "Sony PlayStation Portable (PSP) emulator. Development build",
"homepage": "https://www.ppsspp.org",
"license": {
"identifier": "GPL 2.0 or later",
"url": "https://github.com/hrydgard/ppsspp/blob/master/LICENSE.TXT"
},
"license": "GPL-2.0-or-later",
"architecture": {
"32bit": {
"url": "https://buildbot.orphis.net/ppsspp/index.php?m=dl&rev=v1.14.1-27-$commit&platform=windows-x86#/dl.7z",
"hash": "c10b5c15f5e5c84069eb3d694c53737272858ab81f72eda39e9438430b2da8d5",
"64bit": {
"url": "https://buildbot.orphis.net/ppsspp/index.php?m=dl&rev=v1.14.1-26-gc730ba765&platform=windows-amd64#/dl.zip",
"hash": "bae34be5e898e8a55f07c92edc5f39cbaf1f6a1be77b7d5f75ddb2e28a4e1737",
"bin": [
[
"PPSSPPWindows.exe",
"PPSSPPWindows64.exe",
"ppsspp-dev"
]
],
"shortcuts": [
[
"PPSSPPWindows.exe",
"PPSSPP (development)"
"PPSSPPWindows64.exe",
"PPSSPP (Development)"
]
]
},
"64bit": {
"url": "https://buildbot.orphis.net/ppsspp/index.php?m=dl&rev=v1.14.1-27-$commit&platform=windows-amd64#/dl.7z",
"hash": "5d31103fe9e469920c0ce57c87660a4e2b3f81e6b665d6bfad29a7e3088a6c82",
"32bit": {
"url": "https://buildbot.orphis.net/ppsspp/index.php?m=dl&rev=v1.14.1-26-gc730ba765&platform=windows-x86#/dl.zip",
"hash": "1a49d45b53d99ed8028d779dd1fa8668e40e6e5536d1b0097511646fb3cfb9a7",
"bin": [
[
"PPSSPPWindows64.exe",
"PPSSPPWindows.exe",
"ppsspp-dev"
]
],
"shortcuts": [
[
"PPSSPPWindows64.exe",
"PPSSPP (development)"
"PPSSPPWindows.exe",
"PPSSPP (Development)"
]
]
}
Expand All @@ -54,16 +51,16 @@
],
"checkver": {
"url": "https://buildbot.orphis.net/ppsspp/index.php",
"regex": "v(?<basever>\\d{1,2}\\.\\d{1,2}\\.\\d{1,2})-(?<build>\\d{1,4})-g(?<commit>[a-f0-9]{9})",
"replace": "${basever}-${build}"
"regex": "rev=v(?<version>[\\d.]+)-(?<build>[\\d]+)-g(?<commit>[\\da-fA-F]+)&(?:amp;)platform=windows-amd64",
"replace": "${version}-${build}-g${commit}"
},
"autoupdate": {
"architecture": {
"32bit": {
"url": "https://buildbot.orphis.net/ppsspp/index.php?m=dl&rev=v$matchBasever-$matchBuild-$commit&platform=windows-x86#/dl.7z"
},
"64bit": {
"url": "https://buildbot.orphis.net/ppsspp/index.php?m=dl&rev=v$matchBasever-$matchBuild-$commit&platform=windows-amd64#/dl.7z"
"url": "https://buildbot.orphis.net/ppsspp/index.php?m=dl&rev=v$matchVersion-$matchBuild-g$matchCommit&platform=windows-amd64#/dl.zip"
},
"32bit": {
"url": "https://buildbot.orphis.net/ppsspp/index.php?m=dl&rev=v$matchVersion-$matchBuild-g$matchCommit&platform=windows-x86#/dl.zip"
}
}
}
Expand Down
58 changes: 41 additions & 17 deletions bucket/ppsspp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,12 @@
{
"version": "1.12.3",
"description": "Sony PSP emulator",
"version": "1.14.1",
"description": "Sony PlayStation Portable (PSP) emulator",
"homepage": "https://www.ppsspp.org",
"license": {
"identifier": "GPL 2.0 or later",
"url": "https://github.com/hrydgard/ppsspp/blob/master/LICENSE.TXT"
},
"url": "https://ppsspp.org/files/1_12_3/ppsspp_win.zip",
"hash": "f909ae76b63984cd88f8c3e8ff56fd6e6bd7de98dd1ee441b5290ddce3fe7d94",
"pre_install": [
"if (!(Test-Path \"$persist_dir\")) {",
" New-Item \"$persist_dir\" -ItemType Directory | Out-Null",
" New-Item \"$persist_dir\\memstick\" -ItemType Directory | Out-Null",
"}"
],
"license": "GPL-2.0-or-later",
"architecture": {
"64bit": {
"url": "https://ppsspp.org/files/1_14_1/ppsspp_win.zip",
"hash": "55d0ed4fa4eb44f6e6afffe74205ba396ddd080c31bfb61dfa55a1e9367674c4",
"bin": [
[
"PPSSPPWindows64.exe",
Expand All @@ -25,6 +18,31 @@
"PPSSPPWindows64.exe",
"PPSSPP"
]
]
},
"arm64": {
"url": "https://ppsspp.org/files/1_14_1/PPSSPPWindowsARM64.zip",
"hash": "79b30b1f8152382560797b7059e94fc2a5ddf277092894c76fac3f1102539ef9",
"bin": [
[
"PPSSPPWindowsARM64.exe",
"ppsspp"
]
],
"shortcuts": [
[
"PPSSPPWindowsARM64.exe",
"PPSSPP"
]
]
}
},
"extract_dir": "ppsspp",
"pre_install": [
"if (!(Test-Path \"$persist_dir\")) {",
" New-item \"$persist_dir\" -ItemType Directory | Out-Null",
" New-item \"$persist_dir\\memstick\" -ItemType Directory | Out-Null",
"}"
],
"persist": [
"assets",
Expand All @@ -33,10 +51,16 @@
],
"checkver": {
"url": "https://www.ppsspp.org/downloads.html",
"regex": "Download ((?<major>\\d)\\.(?<minor>\\d{1,3})\\.(?<patch>\\d{1,3})) zip",
"replace": "${major}.${minor}.${patch}"
"regex": "Download ([\\d.]+) zip"
},
"autoupdate": {
"url": "https://ppsspp.org/files/${major}_${minor}_${patch}/ppsspp_win.zip"
"architecture": {
"64bit": {
"url": "https://ppsspp.org/files/$underscoreVersion/ppsspp_win.zip"
},
"arm64": {
"url": "https://ppsspp.org/files/$underscoreVersion/PPSSPPWindowsARM64.zip"
}
}
}
}