Merge pull request #1 from MickHarrigan/dev

Ci fixes
MickHarrigan · Dec 2, 2023 · b22a8f6 · b22a8f6
2 parents 9a18c79 + 926a53d
commit b22a8f6
Show file tree

Hide file tree

Showing 22 changed files with 7 additions and 1,051 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,7 +2,11 @@ name: CI
 
 on:
   pull_request:
+    branches:
+      - main
   push:
+    branches:
+      - main
 
 jobs:
   test:

diff --git a/.github/workflows/release-android-google-play.yaml b/.github/workflows/release-android-google-play.yaml
diff --git a/.github/workflows/release-ios-testflight.yaml b/.github/workflows/release-ios-testflight.yaml
diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,14 +1,11 @@
 [package]
-name = "bevy_game" # ToDo
+name = "bevy_game"                               # ToDo
 version = "0.1.0"
 publish = false
-authors = ["Niklas Eicker <[email protected]>"] # ToDo: you are the author ;)
+authors = ["Niklas Eicker <[email protected]>"]        # ToDo: you are the author ;)
 edition = "2021"
 exclude = ["dist", "build", "assets", "credits"]
 
-[workspace]
-members = ["mobile"]
-
 [profile.dev.package."*"]
 opt-level = 3
 
@@ -25,9 +22,7 @@ inherits = "release"
 lto = "thin"
 
 [features]
-dev = [
-    "bevy/dynamic_linking",
-]
+dev = ["bevy/dynamic_linking"]
 
 # All of Bevy's default features exept for the audio related ones (bevy_audio, vorbis), since they clash with bevy_kira_audio
 #   and android_shared_stdcxx, since that is covered in `mobile`

diff --git a/build/android/res/mipmap-mdpi/icon.png b/build/android/res/mipmap-mdpi/icon.png
diff --git a/mobile/.gitignore b/mobile/.gitignore
diff --git a/mobile/Cargo.toml b/mobile/Cargo.toml
diff --git a/mobile/Makefile b/mobile/Makefile
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,11 @@ name: CI @@
     on:
       pull_request:
+        branches:
+          - main
       push:
+        branches:
+          - main
     jobs:
       test:
@@ Expand Down @@