Skip to content

Commit

Permalink
Update bshook
Browse files Browse the repository at this point in the history
  • Loading branch information
FrozenAlex committed Dec 23, 2024
1 parent 7fc20f4 commit 54aee60
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 49 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
name: Checkout
with:
submodules: true
Expand All @@ -34,7 +34,7 @@ jobs:
cat ${GITHUB_WORKSPACE}/ndkpath.txt
- name: Get QPM
uses: Fernthedev/qpm-action@main
uses: Fernthedev/qpm-action@v1
with:
#required
workflow_token: ${{secrets.GITHUB_TOKEN}}
Expand All @@ -60,21 +60,21 @@ jobs:
echo ::set-output name=NAME::"${files[0]}"
- name: Upload non-debug artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: ${{ steps.libname.outputs.NAME }}
path: ./build/${{ steps.libname.outputs.NAME }}
if-no-files-found: error

- name: Upload qmod artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: ${{env.qmodName}}.qmod
path: ./${{ env.qmodName }}.qmod
if-no-files-found: error

- name: Upload debug artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: debug_${{ steps.libname.outputs.NAME }}
path: ./build/debug/${{ steps.libname.outputs.NAME }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ jobs:
echo "BS_VERSION=$TEMP" >> $GITHUB_ENV
- uses: actions/checkout@v3
- uses: actions/checkout@v4
name: Checkout
with:
submodules: true
lfs: true

- uses: seanmiddleditch/gha-setup-ninja@v3
- uses: seanmiddleditch/gha-setup-ninja@v5

- name: Setup Canary NDK
id: setup-ndk
Expand All @@ -46,7 +46,7 @@ jobs:
cat ${GITHUB_WORKSPACE}/ndkpath.txt
- name: Get QPM
uses: Fernthedev/qpm-action@main
uses: Fernthedev/qpm-action@v1
with:
#required
workflow_token: ${{secrets.GITHUB_TOKEN}}
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
echo "QMOD_SHA=$(sha256sum ./${{ env.qmodName }}.qmod | grep -Po "^[0-9a-f]+")" >> $GITHUB_ENV
- name: Release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
with:
tag_name: ${{ env.VERSION_TAG }}
Expand Down
6 changes: 3 additions & 3 deletions qpm.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"info": {
"name": "BetterSongSearch",
"id": "BetterSongSearch",
"version": "0.1.0",
"version": "2.1.3",
"url": "https://github.com/bsq-ports/BetterSongSearchQuest",
"additionalData": {
"overrideSoName": "libBetterSongSearch.so",
Expand Down Expand Up @@ -42,7 +42,7 @@
},
{
"id": "song-details",
"versionRange": "^0.3.4",
"versionRange": "^0.3.6",
"additionalData": {}
},
{
Expand All @@ -67,7 +67,7 @@
},
{
"id": "beatsaverplusplus",
"versionRange": "^0.1.5",
"versionRange": "^0.1.6",
"additionalData": {}
},
{
Expand Down
77 changes: 40 additions & 37 deletions qpm.shared.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,18 @@
"info": {
"name": "BetterSongSearch",
"id": "BetterSongSearch",
"version": "0.1.0",
"version": "2.1.3",
"url": "https://github.com/bsq-ports/BetterSongSearchQuest",
"additionalData": {
"overrideSoName": "libBetterSongSearch.so",
"cmake": true
}
},
"workspace": {
"scripts": {}
"scripts": {},
"qmodIncludeDirs": [],
"qmodIncludeFiles": [],
"qmodOutput": null
},
"dependencies": [
{
Expand Down Expand Up @@ -47,7 +50,7 @@
},
{
"id": "song-details",
"versionRange": "^0.3.4",
"versionRange": "^0.3.6",
"additionalData": {}
},
{
Expand All @@ -72,7 +75,7 @@
},
{
"id": "beatsaverplusplus",
"versionRange": "^0.1.5",
"versionRange": "^0.1.6",
"additionalData": {}
},
{
Expand All @@ -98,17 +101,17 @@
{
"dependency": {
"id": "web-utils",
"versionRange": "=0.6.6",
"versionRange": "=0.6.7",
"additionalData": {
"soLink": "https://github.com/RedBrumbler/WebUtils/releases/download/v0.6.6/libweb-utils.so",
"debugSoLink": "https://github.com/RedBrumbler/WebUtils/releases/download/v0.6.6/debug_libweb-utils.so",
"soLink": "https://github.com/RedBrumbler/WebUtils/releases/download/v0.6.7/libweb-utils.so",
"debugSoLink": "https://github.com/RedBrumbler/WebUtils/releases/download/v0.6.7/debug_libweb-utils.so",
"overrideSoName": "libweb-utils.so",
"modLink": "https://github.com/RedBrumbler/WebUtils/releases/download/v0.6.6/WebUtils.qmod",
"branchName": "version/v0_6_6",
"modLink": "https://github.com/RedBrumbler/WebUtils/releases/download/v0.6.7/WebUtils.qmod",
"branchName": "version/v0_6_7",
"cmake": false
}
},
"version": "0.6.6"
"version": "0.6.7"
},
{
"dependency": {
Expand All @@ -127,26 +130,26 @@
},
{
"dependency": {
"id": "libil2cpp",
"versionRange": "=0.3.2",
"id": "rapidjson-macros",
"versionRange": "=1.2.1",
"additionalData": {
"headersOnly": true,
"cmake": false
"branchName": "version/v1_2_1",
"cmake": true
}
},
"version": "0.3.2"
"version": "1.2.1"
},
{
"dependency": {
"id": "rapidjson-macros",
"versionRange": "=1.2.1",
"id": "libil2cpp",
"versionRange": "=0.3.2",
"additionalData": {
"headersOnly": true,
"branchName": "version/v1_2_1",
"cmake": true
"cmake": false
}
},
"version": "1.2.1"
"version": "0.3.2"
},
{
"dependency": {
Expand All @@ -162,17 +165,17 @@
{
"dependency": {
"id": "songcore",
"versionRange": "=1.1.14",
"versionRange": "=1.1.15",
"additionalData": {
"soLink": "https://github.com/raineio/Quest-SongCore/releases/download/v1.1.14/libsongcore.so",
"debugSoLink": "https://github.com/raineio/Quest-SongCore/releases/download/v1.1.14/debug_libsongcore.so",
"soLink": "https://github.com/raineio/Quest-SongCore/releases/download/v1.1.15/libsongcore.so",
"debugSoLink": "https://github.com/raineio/Quest-SongCore/releases/download/v1.1.15/debug_libsongcore.so",
"overrideSoName": "libsongcore.so",
"modLink": "https://github.com/raineio/Quest-SongCore/releases/download/v1.1.14/SongCore.qmod",
"branchName": "version/v1_1_14",
"modLink": "https://github.com/raineio/Quest-SongCore/releases/download/v1.1.15/SongCore.qmod",
"branchName": "version/v1_1_15",
"cmake": true
}
},
"version": "1.1.14"
"version": "1.1.15"
},
{
"dependency": {
Expand All @@ -192,17 +195,17 @@
{
"dependency": {
"id": "song-details",
"versionRange": "=0.3.4",
"versionRange": "=0.3.6",
"additionalData": {
"soLink": "https://github.com/RedBrumbler/SongDetails/releases/download/v0.3.4/libsongdetails.so",
"debugSoLink": "https://github.com/RedBrumbler/SongDetails/releases/download/v0.3.4/debug_libsongdetails.so",
"soLink": "https://github.com/FrozenAlex/SongDetails/releases/download/v0.3.6/libsongdetails.so",
"debugSoLink": "https://github.com/FrozenAlex/SongDetails/releases/download/v0.3.6/debug_libsongdetails.so",
"overrideSoName": "libsongdetails.so",
"modLink": "https://github.com/RedBrumbler/SongDetails/releases/download/v0.3.4/SongDetails.qmod",
"branchName": "version/v0_3_4",
"modLink": "https://github.com/FrozenAlex/SongDetails/releases/download/v0.3.6/SongDetails.qmod",
"branchName": "version/v0_3_6",
"cmake": false
}
},
"version": "0.3.4"
"version": "0.3.6"
},
{
"dependency": {
Expand Down Expand Up @@ -333,17 +336,17 @@
{
"dependency": {
"id": "beatsaverplusplus",
"versionRange": "=0.1.5",
"versionRange": "=0.1.6",
"additionalData": {
"soLink": "https://github.com/RedBrumbler/BeatSaverPlusPlus/releases/download/v0.1.5/libbeatsaverplusplus.so",
"debugSoLink": "https://github.com/RedBrumbler/BeatSaverPlusPlus/releases/download/v0.1.5/debug_libbeatsaverplusplus.so",
"soLink": "https://github.com/RedBrumbler/BeatSaverPlusPlus/releases/download/v0.1.6/libbeatsaverplusplus.so",
"debugSoLink": "https://github.com/RedBrumbler/BeatSaverPlusPlus/releases/download/v0.1.6/debug_libbeatsaverplusplus.so",
"overrideSoName": "libbeatsaverplusplus.so",
"modLink": "https://github.com/RedBrumbler/BeatSaverPlusPlus/releases/download/v0.1.5/BeatSaverPlusPlus.qmod",
"branchName": "version/v0_1_5",
"modLink": "https://github.com/RedBrumbler/BeatSaverPlusPlus/releases/download/v0.1.6/BeatSaverPlusPlus.qmod",
"branchName": "version/v0_1_6",
"cmake": false
}
},
"version": "0.1.5"
"version": "0.1.6"
},
{
"dependency": {
Expand Down

0 comments on commit 54aee60

Please sign in to comment.