Merge branch 'main' into testing

This commit is contained in:
Nitwel 2023-11-25 20:09:32 +01:00 committed by GitHub
commit 51ec0eb2e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 5 deletions

2
.github/FUNDING.yml vendored
View File

@ -1,2 +1,2 @@
github: [Nitwel]
custom: ["https://paypal.me/nitwel"]
custom: ["https://paypal.me/nitwel", "https://nitwel.itch.io/immersive-home"]

View File

@ -63,7 +63,12 @@ jobs:
sed -i 's/singleInstancePerTask/singleTask/g' ./android/build/AndroidManifest.xml
sed -i 's/BUILD_VERSION/${{ github.ref_name }}/g' ./android/build/AndroidManifest.xml
versioncode=$(eval "git tag | grep -v "test" | wc -l")
sed -i "s/BUILD_VERSION_CODE/$versioncode/g" export_presets.cfg
sed -i "s/android:versionCode=\"1\"/android:versionCode=\"$versioncode\"/g" ./android/build/AndroidManifest.xml
sed -i 's/BUILD_VERSION/${{ github.ref_name }}/g' export_presets.cfg
sed -i "s/android:versionName=\"1.0\"/android:versionName=\"${{ github.ref_name }}\"/g" ./android/build/AndroidManifest.xml
- name: export game
id: export

View File

@ -6,6 +6,9 @@ on:
tag:
description: "New tag name"
required: true
description:
description: "Description of the new tag"
required: true
jobs:
version:
@ -20,5 +23,5 @@ jobs:
git config user.name "Nitwel"
git config user.email "mail@nitwel.de"
git tag ${{ github.event.inputs.tag }}
git push origin ${{ github.event.inputs.tag }}
git tag -m "${{ github.event.inputs.description }}" ${{ github.event.inputs.tag }} main
git push -u origin main --tags

View File

@ -30,7 +30,7 @@ architectures/armeabi-v7a=false
architectures/arm64-v8a=true
architectures/x86=false
architectures/x86_64=false
version/code=3
version/code=BUILD_VERSION_CODE
version/name="BUILD_VERSION"
package/unique_name="de.nitwel.$genname"
package/name="Immersive Home"