Skip to content

Commit 5bd7f1d

Browse files
hardcpphardcpp
committed
Bump version 6.3.0
1 parent dc59b65 commit 5bd7f1d

File tree

8 files changed

+108
-24
lines changed

8 files changed

+108
-24
lines changed

‎.github/actions/canary-ndk/action.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: "Setup canary ndk"
2+
description: "Sets up canary ndk"
3+
outputs:
4+
ndk-path:
5+
value: ${{ steps.path.outputs.path }}
6+
description: "Output path of the ndk"
7+
cache-hit:
8+
value: ${{ steps.cache.outputs.cache-hit }}
9+
description: "Whether a cache hit occurred for the ndk"
10+
runs:
11+
using: "composite"
12+
steps:
13+
- name: NDK cache
14+
id: cache
15+
uses: actions/cache@v3
16+
with:
17+
path: ${HOME}/android-ndk-r27-canary/
18+
key: ${{ runner.os }}-ndk-r27-canary
19+
20+
- name: Download canary ndk
21+
if: ${{ !steps.cache.outputs.cache-hit }}
22+
env:
23+
CANARY_URL: https://github.com/QuestPackageManager/ndk-canary-archive/releases/download/27.0.1/android-ndk-10883340-linux-x86_64.zip
24+
run: wget ${CANARY_URL} -O ${HOME}/ndk.zip
25+
shell: bash
26+
27+
- name: Unzip ndk
28+
if: ${{ !steps.cache.outputs.cache-hit }}
29+
run: 7z x "${HOME}/ndk.zip" -o"${HOME}/"
30+
shell: bash
31+
32+
- name: Set output
33+
id: path
34+
shell: bash
35+
run: echo "path=${HOME}/android-ndk-r27-canary" >> ${GITHUB_OUTPUT}

‎.github/workflows/build-ndk.yml‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,24 @@ jobs:
3838

3939
- uses: seanmiddleditch/gha-setup-ninja@v3
4040

41+
# Use canary NDK to avoid lesser known compile bugs
42+
- name: Setup canary NDK
43+
id: setup-ndk
44+
uses: ./.github/actions/canary-ndk
45+
4146
- name: Create ndkpath.txt
4247
run: |
43-
echo "$ANDROID_NDK_LATEST_HOME" > ${GITHUB_WORKSPACE}/ndkpath.txt
48+
echo ${{ steps.setup-ndk.outputs.ndk-path }} > ${GITHUB_WORKSPACE}/ndkpath.txt
4449
cat ${GITHUB_WORKSPACE}/ndkpath.txt
4550
51+
# get version from pushed tag
52+
- name: Extract version
53+
if: startsWith(github.ref, 'refs/tags/v')
54+
id: version
55+
run: |
56+
echo "TAG=${GITHUB_REF#refs/tags/}" >> ${GITHUB_OUTPUT}
57+
echo "VERSION=${GITHUB_REF#refs/tags/v}" >> ${GITHUB_OUTPUT}
58+
4659
- name: Setup qpm
4760
uses: Fernthedev/qpm-action@main
4861
with:

‎.github/workflows/publish.yml‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,24 @@ jobs:
2222

2323
- uses: seanmiddleditch/gha-setup-ninja@v3
2424

25+
# Use canary NDK to avoid lesser known compile bugs
26+
- name: Setup canary NDK
27+
id: setup-ndk
28+
uses: ./.github/actions/canary-ndk
29+
2530
- name: Create ndkpath.txt
2631
run: |
27-
echo "$ANDROID_NDK_LATEST_HOME" > ${GITHUB_WORKSPACE}/ndkpath.txt
32+
echo ${{ steps.setup-ndk.outputs.ndk-path }} > ${GITHUB_WORKSPACE}/ndkpath.txt
2833
cat ${GITHUB_WORKSPACE}/ndkpath.txt
2934
35+
# get version from pushed tag
36+
- name: Extract version
37+
if: startsWith(github.ref, 'refs/tags/v')
38+
id: version
39+
run: |
40+
echo "TAG=${GITHUB_REF#refs/tags/}" >> ${GITHUB_OUTPUT}
41+
echo "VERSION=${GITHUB_REF#refs/tags/v}" >> ${GITHUB_OUTPUT}
42+
3043
- name: Get Tag Version
3144
id: get_tag_version
3245
run: |

‎createqmod.ps1‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,17 @@ foreach ($mod in $modJson.modFiles) {
3232
}
3333
$filelist += $path
3434
}
35+
foreach ($mod in $modJson.lateModFiles) {
36+
$path = "./build/" + $mod
37+
if (-not (Test-Path $path)) {
38+
$path = "./extern/libs/" + $mod
39+
}
40+
if (-not (Test-Path $path)) {
41+
Write-Output "Error: could not find dependency: $path"
42+
exit 1
43+
}
44+
$filelist += $path
45+
}
3546

3647
foreach ($lib in $modJson.libraryFiles) {
3748
#if ($lib -eq "libchatplex-sdk-bs.so") {

‎mod.json‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"_QPVersion": "0.1.2",
2+
"_QPVersion": "0.1.1",
33
"name": "QBeatSaberPlus-MenuMusic",
44
"id": "qbeatsaberplus-menumusic",
55
"modloader": "Scotland2",
66
"author": "HardCPP",
7-
"version": "6.2.1",
7+
"version": "6.3.0",
88
"packageId": "com.beatgames.beatsaber",
99
"packageVersion": "1.35.0_8016709773",
1010
"description": "Feel good!",
@@ -13,7 +13,7 @@
1313
{
1414
"version": "^0.17.6",
1515
"id": "custom-types",
16-
"downloadIfMissing": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.6/CustomTypes.qmod"
16+
"downloadIfMissing": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.7/CustomTypes.qmod"
1717
},
1818
{
1919
"version": "=1.1.4",
@@ -24,14 +24,18 @@
2424
"version": "^3.6.3",
2525
"id": "paper",
2626
"downloadIfMissing": "https://github.com/Fernthedev/paperlog/releases/download/v3.6.3/paperlog.qmod"
27+
},
28+
{
29+
"version": "^6.3.0",
30+
"id": "chatplex-sdk-bs",
31+
"downloadIfMissing": "https://github.com/hardcpp/QuestChatPlexSDK-BS/releases/download/v6.3.0/ChatPlexSDK-BS.qmod"
2732
}
2833
],
2934
"modFiles": [],
3035
"lateModFiles": [
3136
"libqbeatsaberplus-menumusic.so"
3237
],
3338
"libraryFiles": [
34-
"libchatplex-sdk-bs.so",
3539
"libbeatsaber-hook_5_1_6.so"
3640
],
3741
"fileCopies": [],

‎qpm.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"info": {
66
"name": "QBeatSaberPlus-MenuMusic",
77
"id": "qbeatsaberplus-menumusic",
8-
"version": "6.2.1",
8+
"version": "6.3.0",
99
"url": "https://github.com/hardcpp/QBeatSaberPlus-MenuMusic",
1010
"additionalData": {
1111
"overrideSoName": "libqbeatsaberplus-menumusic.so",
@@ -85,7 +85,7 @@
8585
},
8686
{
8787
"id": "chatplex-sdk-bs",
88-
"versionRange": "^6.2.1",
88+
"versionRange": "^6.3.0",
8989
"additionalData": {
9090
"private": true
9191
}

‎qpm.shared.json‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"info": {
77
"name": "QBeatSaberPlus-MenuMusic",
88
"id": "qbeatsaberplus-menumusic",
9-
"version": "6.2.1",
9+
"version": "6.3.0",
1010
"url": "https://github.com/hardcpp/QBeatSaberPlus-MenuMusic",
1111
"additionalData": {
1212
"overrideSoName": "libqbeatsaberplus-menumusic.so",
@@ -36,7 +36,10 @@
3636
"qpm qmod build",
3737
"pwsh ./createqmod.ps1 -clean"
3838
]
39-
}
39+
},
40+
"qmodIncludeDirs": [],
41+
"qmodIncludeFiles": [],
42+
"qmodOutput": null
4043
},
4144
"dependencies": [
4245
{
@@ -86,7 +89,7 @@
8689
},
8790
{
8891
"id": "chatplex-sdk-bs",
89-
"versionRange": "^6.2.1",
92+
"versionRange": "^6.3.0",
9093
"additionalData": {
9194
"private": true
9295
}
@@ -117,12 +120,13 @@
117120
{
118121
"dependency": {
119122
"id": "libil2cpp",
120-
"versionRange": "=0.3.1",
123+
"versionRange": "=0.3.2",
121124
"additionalData": {
122-
"headersOnly": true
125+
"headersOnly": true,
126+
"cmake": false
123127
}
124128
},
125-
"version": "0.3.1"
129+
"version": "0.3.2"
126130
},
127131
{
128132
"dependency": {
@@ -144,24 +148,28 @@
144148
{
145149
"dependency": {
146150
"id": "chatplex-sdk-bs",
147-
"versionRange": "=6.2.1",
151+
"versionRange": "=6.3.0",
148152
"additionalData": {
153+
"soLink": "https://github.com/hardcpp/QuestChatPlexSDK-BS/releases/download/v6.3.0/libchatplex-sdk-bs.so",
154+
"debugSoLink": "https://github.com/hardcpp/QuestChatPlexSDK-BS/releases/download/v6.3.0/debug_libchatplex-sdk-bs.so",
149155
"overrideSoName": "libchatplex-sdk-bs.so",
156+
"modLink": "https://github.com/hardcpp/QuestChatPlexSDK-BS/releases/download/v6.3.0/ChatPlexSDK-BS.qmod",
157+
"branchName": "version/v6_3_0",
150158
"cmake": true
151159
}
152160
},
153-
"version": "6.2.1"
161+
"version": "6.3.0"
154162
},
155163
{
156164
"dependency": {
157165
"id": "custom-types",
158-
"versionRange": "=0.17.6",
166+
"versionRange": "=0.17.7",
159167
"additionalData": {
160-
"soLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.6/libcustom-types.so",
161-
"debugSoLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.6/debug_libcustom-types.so",
168+
"soLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.7/libcustom-types.so",
169+
"debugSoLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.7/debug_libcustom-types.so",
162170
"overrideSoName": "libcustom-types.so",
163-
"modLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.6/CustomTypes.qmod",
164-
"branchName": "version/v0_17_6",
171+
"modLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.7/CustomTypes.qmod",
172+
"branchName": "version/v0_17_7",
165173
"compileOptions": {
166174
"cppFlags": [
167175
"-Wno-invalid-offsetof"
@@ -170,7 +178,7 @@
170178
"cmake": true
171179
}
172180
},
173-
"version": "0.17.6"
181+
"version": "0.17.7"
174182
},
175183
{
176184
"dependency": {

‎start-logging.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ if ($help -eq $true) {
3636
$bspid = adb shell pidof com.beatgames.beatsaber
3737
$command = "adb logcat "
3838

39-
if ($all -eq $false) {
39+
if ($all -eq $true) {
4040
$loops = 0
4141
while ([string]::IsNullOrEmpty($bspid) -and $loops -lt 3) {
4242
Start-Sleep -Milliseconds 100
@@ -62,7 +62,7 @@ if ($all -eq $false) {
6262
$pattern += "$custom|"
6363
}
6464
if ($pattern -eq "(") {
65-
$pattern = "(QuestHook|modloader|scotland2|ChatPlexSDK-BS|"
65+
$pattern = "(QuestHook|modloader|ChatPlexSDK-BS|"
6666
}
6767
$pattern += "AndroidRuntime|CRASH)"
6868
$command += " | Select-String -pattern `"$pattern`""

0 commit comments

Comments
 (0)