Skip to content
This repository was archived by the owner on May 17, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 16 additions & 17 deletions .github/workflows/test-build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
lfs: true # Add this line to enable LFS support

- name: Install Linux dependencies
run: |
sudo apt-get update
sudo apt-get install -y libasound2-dev libudev-dev pkg-config
sudo apt-get install -y libasound2-dev libudev-dev pkg-config libx11-dev libxcb-shape0-dev libxcb-xfixes0-dev libwayland-dev libxkbcommon-dev

- name: Setup Rust
uses: dtolnay/rust-toolchain@stable
Expand Down Expand Up @@ -55,6 +57,8 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
lfs: true # Add this line to enable LFS support

- name: Setup Rust
uses: dtolnay/rust-toolchain@stable
Expand Down Expand Up @@ -86,28 +90,23 @@ jobs:

- name: Create game directory structure
run: |
# Create base dist directory
# Create base dist directory WITH assets subdirectory
mkdir -p dist
mkdir -p dist\assets

# Copy executable
Write-Host "Copying executable..."
copy target\ci\my-rts-game.exe dist\

# Copy assets to the correct structure - extract from assets/ to dist/
# Copy all assets to dist/assets
if (Test-Path -Path assets) {
Write-Host "Copying assets to distribution folder..."
# Get all files in assets directory
Get-ChildItem -Path assets -Recurse -File | ForEach-Object {
# Get relative path from assets directory
$relativePath = $_.FullName.Substring((Get-Item -Path "assets").FullName.Length + 1)
# Create target directory
$targetDir = Join-Path -Path "dist" -ChildPath (Split-Path -Path $relativePath)
if (-not (Test-Path -Path $targetDir)) {
New-Item -Path $targetDir -ItemType Directory | Out-Null
}
# Copy file
Copy-Item -Path $_.FullName -Destination (Join-Path -Path "dist" -ChildPath $relativePath) -Force
}
Write-Host "Copying complete assets folder to distribution..."
xcopy "assets\*" "dist\assets\" /E /I /Y

# Verify the assets were copied
Write-Host "Verifying asset files..."
$assetCount = (Get-ChildItem -Path dist\assets -Recurse -File).Count
Write-Host "Copied $assetCount asset files"
}

# Copy documentation
Expand Down Expand Up @@ -136,7 +135,7 @@ jobs:

- name: Install Inno Setup using Chocolatey
run: |
choco install -y innosetup
choco upgrade -y innosetup
shell: powershell

- name: Create Inno Setup Script
Expand Down
5 changes: 0 additions & 5 deletions .vscode/settings.json

This file was deleted.

74 changes: 5 additions & 69 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 1 addition & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,4 @@ codegen-units = 16
lto = "thin"

[dependencies]
bevy = { version = "0.14.2", default-features = false, features = [
"bevy_asset",
"bevy_sprite",
"bevy_ui",
"bevy_text",
"bevy_render",
"bevy_core_pipeline",
"default_font" # Note: singular "font", not "fonts"
]}
bevy = { version = "0.14.2" }
1 change: 1 addition & 0 deletions TODO.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
- [x] Build an exe file for Windows
- [x] Add a dependabot setup
- [x] Setup test framework
- [x] Windows Installer based executable fails with invalid path to assets
- [ ] Add complete unit tests for each .rs file
- [ ] Add an icon for the game
- [ ] Add a splash screen
Expand Down
Loading