diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index c066e88..b71f46a 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,2 +1,2 @@ github: [Nitwel] -custom: ["https://paypal.me/nitwel"] \ No newline at end of file +custom: ["https://paypal.me/nitwel", "https://nitwel.itch.io/immersive-home"] diff --git a/.github/workflows/build-prod.yml b/.github/workflows/build-prod.yml index aadb5b6..d854c53 100644 --- a/.github/workflows/build-prod.yml +++ b/.github/workflows/build-prod.yml @@ -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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 30f8d3e..d7afb99 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 diff --git a/export_presets_prod.cfg b/export_presets_prod.cfg index 514cf7c..c12f50f 100644 --- a/export_presets_prod.cfg +++ b/export_presets_prod.cfg @@ -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"