Merge branch 'main' into testing
This commit is contained in:
commit
51ec0eb2e4
2
.github/FUNDING.yml
vendored
2
.github/FUNDING.yml
vendored
|
@ -1,2 +1,2 @@
|
||||||
github: [Nitwel]
|
github: [Nitwel]
|
||||||
custom: ["https://paypal.me/nitwel"]
|
custom: ["https://paypal.me/nitwel", "https://nitwel.itch.io/immersive-home"]
|
||||||
|
|
7
.github/workflows/build-prod.yml
vendored
7
.github/workflows/build-prod.yml
vendored
|
@ -63,7 +63,12 @@ jobs:
|
||||||
|
|
||||||
sed -i 's/singleInstancePerTask/singleTask/g' ./android/build/AndroidManifest.xml
|
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
|
- name: export game
|
||||||
id: export
|
id: export
|
||||||
|
|
7
.github/workflows/release.yml
vendored
7
.github/workflows/release.yml
vendored
|
@ -6,6 +6,9 @@ on:
|
||||||
tag:
|
tag:
|
||||||
description: "New tag name"
|
description: "New tag name"
|
||||||
required: true
|
required: true
|
||||||
|
description:
|
||||||
|
description: "Description of the new tag"
|
||||||
|
required: true
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
version:
|
version:
|
||||||
|
@ -20,5 +23,5 @@ jobs:
|
||||||
git config user.name "Nitwel"
|
git config user.name "Nitwel"
|
||||||
git config user.email "mail@nitwel.de"
|
git config user.email "mail@nitwel.de"
|
||||||
|
|
||||||
git tag ${{ github.event.inputs.tag }}
|
git tag -m "${{ github.event.inputs.description }}" ${{ github.event.inputs.tag }} main
|
||||||
git push origin ${{ github.event.inputs.tag }}
|
git push -u origin main --tags
|
||||||
|
|
|
@ -30,7 +30,7 @@ architectures/armeabi-v7a=false
|
||||||
architectures/arm64-v8a=true
|
architectures/arm64-v8a=true
|
||||||
architectures/x86=false
|
architectures/x86=false
|
||||||
architectures/x86_64=false
|
architectures/x86_64=false
|
||||||
version/code=3
|
version/code=BUILD_VERSION_CODE
|
||||||
version/name="BUILD_VERSION"
|
version/name="BUILD_VERSION"
|
||||||
package/unique_name="de.nitwel.$genname"
|
package/unique_name="de.nitwel.$genname"
|
||||||
package/name="Immersive Home"
|
package/name="Immersive Home"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user