From d72d53a7c93b2f0c5cb4ad1286ac214f10550249 Mon Sep 17 00:00:00 2001 From: Niklas Eicker Date: Fri, 29 Dec 2023 22:55:20 +0100 Subject: [PATCH] Fix windows and iOS targets document that Android makes debug builds, otherwise a release keystore needs to be configured --- .github/workflows/release-android-google-play.yaml | 2 ++ .github/workflows/release-ios-testflight.yaml | 4 +++- .github/workflows/release.yaml | 6 ++++-- README.md | 2 ++ build/windows/installer/Package.wxs | 2 +- mobile/mobile.xcodeproj/project.pbxproj | 6 +++--- 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release-android-google-play.yaml b/.github/workflows/release-android-google-play.yaml index 13656ee..c03a4e8 100644 --- a/.github/workflows/release-android-google-play.yaml +++ b/.github/workflows/release-android-google-play.yaml @@ -1,3 +1,5 @@ +# For setup instructions regarding this workflow, see https://www.nikl.me/blog/2023/github_workflow_to_publish_android_app/ + name: release-android-google-play on: diff --git a/.github/workflows/release-ios-testflight.yaml b/.github/workflows/release-ios-testflight.yaml index 1b347eb..86c6bd8 100644 --- a/.github/workflows/release-ios-testflight.yaml +++ b/.github/workflows/release-ios-testflight.yaml @@ -4,7 +4,9 @@ name: release-ios-testflight # The version from input is only used for artifact names and as the release to upload the final ipa to. # Bump the versions in `mobile/ios-src/Info.plist` to change the version of your app bundle. -# Special setup and Apple Developer Program membership (99$/year) is required for this workflow! (docs are in work; Todo) +# Special setup and Apple Developer Program membership (99$/year) is required for this workflow! + +# For setup instructions, see https://www.nikl.me/blog/2023/github_workflow_to_publish_ios_app/ on: workflow_dispatch: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 4594bd7..7ec5b0c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -261,12 +261,14 @@ jobs: - name: Install Cargo APK run: cargo install --force cargo-apk - name: Build app for Android - run: ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME cargo apk build --profile dist --package mobile + # This uses a debug build, since release builds require keystore configuration + # For AAB builds that can be pushed to the Play store, see the release-android-google-play workflow. + run: ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME cargo apk build --package mobile - name: Upload release uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: target/dist/apk/${{ env.GAME_OSX_APP_NAME }}.apk + file: target/debug/apk/${{ env.GAME_OSX_APP_NAME }}.apk asset_name: ${{ env.GAME_EXECUTABLE_NAME }}_${{ env.VERSION }}_android.apk release_name: ${{ env.VERSION }} tag: ${{ env.VERSION }} diff --git a/README.md b/README.md index 1f26493..12a63b3 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ Template for a Game using the awesome [Bevy engine][bevy] featuring out of the box builds for Windows, Linux, macOS, Web (Wasm), Android, and iOS. # What does this template give you? + * small example ["game"](https://niklasei.github.io/bevy_game_template/) * easy setup for running the web build using [trunk] (`trunk serve`) * run the native version with `cargo run` @@ -12,6 +13,7 @@ Template for a Game using the awesome [Bevy engine][bevy] featuring out of the b * WARNING: if you work in a private repository, please be aware that macOS and Windows runners cost more build minutes. **For public repositories the builds are free!** # How to use this template? + 1. Click "Use this template" on the repository's page 2. Look for `ToDo` to use your own game name everywhere 3. [Update the icons as described below](#updating-the-icons) diff --git a/build/windows/installer/Package.wxs b/build/windows/installer/Package.wxs index 80791e6..305bc1f 100644 --- a/build/windows/installer/Package.wxs +++ b/build/windows/installer/Package.wxs @@ -35,7 +35,7 @@ - + diff --git a/mobile/mobile.xcodeproj/project.pbxproj b/mobile/mobile.xcodeproj/project.pbxproj index 345edb6..d98a2c0 100644 --- a/mobile/mobile.xcodeproj/project.pbxproj +++ b/mobile/mobile.xcodeproj/project.pbxproj @@ -287,15 +287,15 @@ ); "LIBRARY_SEARCH_PATHS[sdk=iphoneos*][arch=arm64]" = ( "$(inherited)", - "../target/aarch64-apple-ios/release", + "../target/aarch64-apple-ios/dist", ); "LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*][arch=arm64]" = ( "$(inherited)", - "../target/aarch64-apple-ios-sim/release", + "../target/aarch64-apple-ios-sim/dist", ); "LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*][arch=x86_64]" = ( "$(inherited)", - "../target/x86_64-apple-ios/release", + "../target/x86_64-apple-ios/dist", ); OTHER_LDFLAGS = ( "$(inherited)",