Skip to content

Commit

Permalink
Update for 1.19.1 and 1.20.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@michael-r-elp
michael-r-elp committed Mar 12, 2022
1 parent ea102c2 commit acea53b
Show file tree
Hide file tree
Showing 15 changed files with 517 additions and 455 deletions.
24 changes: 13 additions & 11 deletions .github/workflows/Pre-Release.yml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
name: Pre-Release Mod

on:
workflow_dispatch:

name: Pre-Release Mod
env:
module_id: clockmod
version: 1.5.1-rc.1
BSVersion: 1.17.1
bs_hook: 2_3_0
codegen: 0_14_0
ndkname: android-ndk-r23
module_id: ClockMod
version: 1.5.3-rc.1
ndkname: android-ndk-r24


jobs:
Expand Down Expand Up @@ -63,7 +61,7 @@ jobs:
cache-name: cache-qpm-deps
with:
path: QPM_Temp
key: ${{ runner.os }}-${{ env.cache-name }}
key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('qpm_${{ env.BSVersion }}.json', '.github/BuildMod.yml') }}
restore-keys: |
${{ runner.os }}-${{ env.cache-name }}-
${{ runner.os }}-${{ env.cache-name }}
Expand All @@ -81,13 +79,17 @@ jobs:
echo "Checking QPM_Temp Folders"
ls -lh QPM_Temp/
echo ""
echo "Listing beatsaber-hook folder"
ls QPM_Temp/beatsaber-hook/
echo ""
echo "Listing all .so files in QPM_Temp"
find QPM_Temp -type f -name "*.so"
# continue-on-error: true
- name: Build
run: |
cd ${GITHUB_WORKSPACE}
./QPM/qpm-rust package edit --version ${{ env.version }}
./QPM/qpm-rust qmod build
pwsh -Command ./build.ps1 --actions
- name: Get Library Name
id: libname
Expand All @@ -99,7 +101,7 @@ jobs:
- name: Package QMOD
run: |
cd ${GITHUB_WORKSPACE}
pwsh -Command ./buildQMOD.ps1 --package
pwsh -Command ./buildQMOD.ps1 -package
- name: Create Release
id: create_pre-release
uses: actions/create-release@v1
Expand All @@ -108,7 +110,7 @@ jobs:
with:
tag_name: ${{ env.version }}
release_name: ${{ env.module_id }} ${{ env.version }} for Beat Saber ${{ env.BSVersion }}
body_path: ./pre-rl-notes
body_path: ./pre-rl-notes.md
draft: false
prerelease: true
- name: Upload QMOD Pre-Release Asset
Expand Down
165 changes: 97 additions & 68 deletions .github/workflows/Release.yml
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
name: Release Mod

on:
workflow_dispatch:
push:
# Sequence of patterns matched against refs/tags
tags:
- '*' # Push events with tag

env:
module_id: clockmod
version: 1.5.1
BSVersion: 1.17.1
bs_hook: 2_3_0
codegen: 0_14_0
ndkname: android-ndk-r23

name: Release Mod
env:
module_id: ClockMod
BSVersion: 1.19.1
ndkname: android-ndk-r24

jobs:
build:
Expand All @@ -21,104 +22,132 @@ jobs:
with:
submodules: true
lfs: true
- name: Install Powershell
run: sudo apt-get install -y powershell

- name: Cache Android NDK
id: cache-ndk
uses: actions/cache@v2
env:
cache-name: cache-ndk
ndkname: android-ndk-r22
with:
path: ndk
key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.ndkname }}
restore-keys: |
${{ runner.os }}-${{ env.cache-name }}-${{ env.ndkname }}
- uses: seanmiddleditch/gha-setup-ninja@v3

#- name: Install Powershell
# run: sudo apt-get install -y powershell

- name: Get the tag name
run: echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV

#- name: Cache Android NDK
# id: cache-ndk
# uses: actions/cache@v2
# env:
# cache-name: cache-ndk
# with:
# path: ndk
# key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.ndkname }}
# restore-keys: |
# ${{ runner.os }}-${{ env.cache-name }}-${{ env.ndkname }}

- name: Install Android NDK
if: steps.cache-ndk.outputs.cache-hit != 'true'
run: |
wget -q -O ndk.zip https://dl.google.com/android/repository/${ndkname}-linux-x86_64.zip
unzip -q ndk.zip
mv ${ndkname} ndk
#- name: Install Android NDK
# if: steps.cache-ndk.outputs.cache-hit != 'true'
# run: |
# wget -q -O ndk.zip https://dl.google.com/android/repository/${ndkname}-linux-x86_64.zip
# unzip -q ndk.zip
# mv ${ndkname} ndk

#- name: Create ndkpath.txt
# run: |
# cd ndk
# pwd > ${GITHUB_WORKSPACE}/ndkpath.txt

- name: Create ndkpath.txt
run: |
cd ndk
pwd > ${GITHUB_WORKSPACE}/ndkpath.txt
echo "$ANDROID_NDK_LATEST_HOME" > ${GITHUB_WORKSPACE}/ndkpath.txt
- name: Get QPM
# if: steps.cache-qpm.outputs.cache-hit != 'true'
if: steps.cache-qpm.outputs.cache-hit != 'true'
uses: dawidd6/action-download-artifact@v2
with:
github_token: ${{secrets.GITHUB_TOKEN}}
workflow: main.yml
name: QPM-ubuntu-x64
workflow: cargo-build.yml
name: linux-qpm-rust
path: QPM
repo: sc2ad/QuestPackageManager

repo: RedBrumbler/QuestPackageManager-Rust

- name: QPM Collapse
run: |
chmod +x ./QPM/qpm-rust
./QPM/qpm-rust collapse
- name: QPM Dependencies Cache
id: cache-qpm-deps
uses: actions/cache@v2
env:
cache-name: cache-qpm-deps
with:
path: QPM_Temp
key: ${{ runner.os }}-${{ env.cache-name }}
path: /home/runner/.local/share/QPM-Rust/cache
key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('qpm.json', '.github/BuildQSounds.yml') }}
restore-keys: |
${{ runner.os }}-${{ env.cache-name }}-
${{ runner.os }}-${{ env.cache-name }}
- name: QPM Restore
run: |
chmod +x ./QPM/QPM
./QPM/QPM restore
./QPM/qpm-rust restore
- name: Check dependency Folders
run: |
echo "Checking extern Folder"
ls -lh ${GITHUB_WORKSPACE}/extern/
echo "Checking extern includes"
ls -lh ${GITHUB_WORKSPACE}/extern/includes
echo ""
echo "Checking libs"
ls -lh ${GITHUB_WORKSPACE}/extern/libs
echo ""
echo "Checking QPM_Temp Folders"
ls -lh QPM_Temp/
echo "Checking QPM-Rust/cache Folder"
ls -lh $HOME/.local/share/QPM-Rust/cache
echo ""
echo "Listing all .so files in QPM_Temp"
find QPM_Temp -type f -name "*.so"
# continue-on-error: true
- name: Build
run: |
cd ${GITHUB_WORKSPACE}
./QPM/qpm-rust package edit --version ${{ env.version }}
./QPM/qpm-rust qmod build
pwsh -Command ./build.ps1 --actions
- name: Get Library Name
id: libname
run: |
cd ./libs/arm64-v8a/
cd ./build/
pattern="lib${module_id}*.so"
files=( $pattern )
echo ::set-output name=NAME::"${files[0]}"
- name: Package QMOD
run: |
cd ${GITHUB_WORKSPACE}
pwsh -Command ./buildQMOD.ps1 --package
- name: Create Release
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ env.version }}
release_name: ${{ env.module_id }} ${{ env.version }} for Beat Saber ${{ env.BSVersion }}
body_path: ./rl-notes
draft: false
prerelease: false
- name: Upload QMOD Release Asset
id: upload-release-QMOD
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
pwsh -Command ./buildQMOD.ps1 -package
- name: Release
uses: softprops/action-gh-release@v1
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./${{ env.module_id }}.qmod
asset_name: ${{ env.module_id }}.qmod
asset_content_type: application/qmod
name: ${{ env.module_id }} ${{ env.version }} for Beat Saber ${{ env.BSVersion }}
files: |
./${{ env.module_id }}.qmod
body_path: ./rl-notes.md
draft: true

#- name: Create Release
# id: create_release
# uses: actions/create-release@v1
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# with:
# tag_name: ${{ github.ref }}
# release_name: ${{ env.module_id }} ${{ github.ref }} for Beat Saber ${{ env.BSVersion }}
# body_path: ./rl-notes.md
# draft: true
# prerelease: false
#- name: Upload QMOD Release Asset
# id: upload-release-QMOD
# uses: actions/upload-release-asset@v1
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# with:
# upload_url: ${{ steps.create_release.outputs.upload_url }}
# asset_path: ./${{ env.module_id }}.qmod
# asset_name: ${{ env.module_id }}.qmod
# asset_content_type: application/qmod
Loading

0 comments on commit acea53b

Please sign in to comment.