Skip to content

Fixed CI build and added support for Civ5 build 4390913#98

Open
VeryHarry7 wants to merge 5 commits intoLymia:masterfrom
VeryHarry7:pr/fix-build-system
Open

Fixed CI build and added support for Civ5 build 4390913#98
VeryHarry7 wants to merge 5 commits intoLymia:masterfrom
VeryHarry7:pr/fix-build-system

Conversation

@VeryHarry7
Copy link

This PR fixes several build issues and adds support for the latest Steam version of Civilization V. Have been unable to test fully in multiplayer, but the patch now shows as active in game, and the multiplayer menu appears in game as well.

Changes

  • New version support: Add hash for Civ5 build 4390913 (latest Steam release)
  • Rust compatibility: Pin to nightly-2024-11-01, fix naked_asm syntax, pin time crate
  • CI reliability: Add pacman retry logic, add sbt to native-image jobs, fix Windows tarball extraction
  • sbt task resolution: Use Def.taskDyn properly to avoid building natives when pre-built binaries exist
  • Runtime fix: Load version info from binary layer instead of include (Civ5's include path doesn't work for
    hook-injected files)

The latest Steam release of Civilization V has a new DLL hash.
This adds version detection for build 4390913.
- Pin time crate version for simplelog compatibility
- Update naked_asm syntax for newer Rust nightly
- Add retry logic for pacman package installation
- Pin Rust toolchain to nightly-2024-11-01
- Add sbt installation to native-image build jobs
- Fix Windows tarball extraction path
Use Def.taskDyn to conditionally choose between pre-built natives
and building from source. This prevents sbt from trying to build
natives when pre-built binaries exist in target/native-bin/.

The key insight is that sbt extracts ALL .value calls at compile
time regardless of if/else branches. By using Def.taskDyn with
the check outside the returned Def.task, we properly isolate the
dependency on buildDylibDir to only when actually needed.
Get version info from binary layer directly instead of using
include for mppatch_version.lua. Civ5's include path resolution
doesn't work for hook-injected files.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant