From 89a2b7d9652bf12cf7d2bca2353f9c8a4ecf348e Mon Sep 17 00:00:00 2001 From: NIMFER Date: Tue, 26 Mar 2024 03:41:43 +0100 Subject: [PATCH] cahnged ttt-ce to ttt_ce due to a syntax conflict, and disabled macos and windows builds --- .github/workflows/ci.yml | 3 ++- .github/workflows/release-android-google-play.yaml | 2 +- .github/workflows/release-ios-testflight.yaml | 2 +- .github/workflows/release.yaml | 2 +- .vscode/launch.json | 14 +++++++------- Bevy-template-README.md | 2 +- Cargo.lock | 4 ++-- Cargo.toml | 2 +- build/windows/installer/Package.wxs | 2 +- mobile/Cargo.toml | 2 +- mobile/src/lib.rs | 2 +- 11 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1169192..f28d81d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,8 @@ jobs: test: strategy: matrix: - os: [windows-latest, ubuntu-latest, macos-latest] + # os: [windows-latest, ubuntu-latest, macos-latest] + os: [ubuntu-latest] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/release-android-google-play.yaml b/.github/workflows/release-android-google-play.yaml index 23ca601..4d01ccd 100644 --- a/.github/workflows/release-android-google-play.yaml +++ b/.github/workflows/release-android-google-play.yaml @@ -17,7 +17,7 @@ on: # ToDo: adapt names env: # used for uploading the app to a GitHub release - GAME_EXECUTABLE_NAME: ttt-ce + GAME_EXECUTABLE_NAME: ttt_ce BUNDLE_PATH: "target/x/release/android/mobile.aab" PACKAGE_NAME: "com.opencodebox.tttce" # release track; you can promote a build to "higher" tracks in the play console or publish to a different track directly diff --git a/.github/workflows/release-ios-testflight.yaml b/.github/workflows/release-ios-testflight.yaml index 3590082..75879f8 100644 --- a/.github/workflows/release-ios-testflight.yaml +++ b/.github/workflows/release-ios-testflight.yaml @@ -19,7 +19,7 @@ on: # ToDo: adapt names env: # used for uploading the app to a GitHub release - GAME_EXECUTABLE_NAME: ttt-ce + GAME_EXECUTABLE_NAME: ttt_ce XCODE_PROJECT: mobile MOBILE_DIRECTORY: mobile diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index a8db05e..0dd2aba 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -14,7 +14,7 @@ on: # ToDo: adapt names env: # This variable is used to name release output files. - GAME_EXECUTABLE_NAME: ttt-ce + GAME_EXECUTABLE_NAME: ttt_ce GAME_OSX_APP_NAME: TTTCE permissions: diff --git a/.vscode/launch.json b/.vscode/launch.json index 353de75..1325cc7 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -12,7 +12,7 @@ "command": "nix-shell --run 'cargo run --features dev'", }, { - "command": "steam-run ./target/debug/ttt-ce", + "command": "steam-run ./target/debug/ttt_ce", "name": "Run compiled (steam-run)", "request": "launch", "type": "node-terminal" @@ -24,13 +24,13 @@ "cargo": { "args": [ "build", - "--bin=ttt-ce", - "--package=ttt-ce", + "--bin=ttt_ce", + "--package=ttt_ce", "--features", "dev" ], "filter": { - "name": "ttt-ce", + "name": "ttt_ce", "kind": "bin" }, }, @@ -55,13 +55,13 @@ "args": [ "test", "--no-run", - "--bin=ttt-ce", - "--package=ttt-ce", + "--bin=ttt_ce", + "--package=ttt_ce", "--features", "dev" ], "filter": { - "name": "ttt-ce", + "name": "ttt_ce", "kind": "bin" } }, diff --git a/Bevy-template-README.md b/Bevy-template-README.md index eab40ff..fb12e49 100644 --- a/Bevy-template-README.md +++ b/Bevy-template-README.md @@ -4,7 +4,7 @@ Template for a Game using the awesome [Bevy engine][bevy] featuring out of the b # What does this template give you? -* small example ["game"](https://niklasei.github.io/ttt-ce_template/) +* small example ["game"](https://niklasei.github.io/ttt_ce_template/) * easy setup for running the web build using [trunk] (`trunk serve`) * run the native version with `cargo run` * workflow for GitHub actions creating releases for Windows, Linux, macOS, and Web (Wasm) ready for distribution diff --git a/Cargo.lock b/Cargo.lock index 2ec0293..19ea262 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2751,7 +2751,7 @@ version = "0.1.0" dependencies = [ "bevy", "cpal", - "ttt-ce", + "ttt_ce", ] [[package]] @@ -4069,7 +4069,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" [[package]] -name = "ttt-ce" +name = "ttt_ce" version = "0.1.0" dependencies = [ "bevy", diff --git a/Cargo.toml b/Cargo.toml index d5926f6..f9c9f11 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "ttt-ce" # ToDo +name = "ttt_ce" # ToDo version = "0.1.0" publish = false authors = ["Mikolaj Wojciech 'Nimfer' Gorski"] # ToDo: you are the author ;) diff --git a/build/windows/installer/Package.wxs b/build/windows/installer/Package.wxs index 4960c88..0d47ad1 100644 --- a/build/windows/installer/Package.wxs +++ b/build/windows/installer/Package.wxs @@ -35,7 +35,7 @@ - + diff --git a/mobile/Cargo.toml b/mobile/Cargo.toml index 504c51f..cfdb8a7 100644 --- a/mobile/Cargo.toml +++ b/mobile/Cargo.toml @@ -9,7 +9,7 @@ name = "mobile" crate-type = ["staticlib", "cdylib"] [dependencies] -ttt-ce = { path = ".." } # ToDo +ttt_ce = { path = ".." } # ToDo bevy = { version = "0.13", default-features = false } # As long as Kira doesn't expose a feature for this, we need to enable it diff --git a/mobile/src/lib.rs b/mobile/src/lib.rs index 13c5f56..08234bb 100644 --- a/mobile/src/lib.rs +++ b/mobile/src/lib.rs @@ -1,6 +1,6 @@ use bevy::prelude::*; use bevy::window::WindowMode; -use ttt-ce::GamePlugin; // ToDo: Replace ttt-ce with your new crate name. +use ttt_ce::GamePlugin; // ToDo: Replace ttt_ce with your new crate name. #[bevy_main] fn main() {