xevion/banner
1
0
Fork 0
mirror of https://github.com/Xevion/banner.git synced 2025-12-06 01:14:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: use wildcard COPY for .git directory, use RAILWAY_GIT_COMMIT_SHA as fallback

Browse Source
This commit is contained in:
Xevion
2025-09-13 21:20:16 -05:00
parent 33b8681b19
commit 08ae54c093
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@@ -38,8 +38,10 @@ WORKDIR /usr/src/banner
# Copy dependency files for better layer caching # Copy dependency files for better layer caching
COPY ./Cargo.toml ./Cargo.lock* ./ COPY ./Cargo.toml ./Cargo.lock* ./
# Copy .git directory for build.rs to access Git information # Copy .git directory for build.rs to access Git information (if available)
COPY ./.git ./.git # This will copy .git (and .gitignore) if it exists, but won't fail if it doesn't
# While normally a COPY requires at least one file, .gitignore should still be available, so this wildcard should always work
COPY ./.git* ./
# Copy build.rs early so it can run during the first build # Copy build.rs early so it can run during the first build
COPY ./build.rs ./ COPY ./build.rs ./

14
build.rs
View File

@@ -1,10 +1,11 @@
use std::process::Command; use std::process::Command;
fn main() { fn main() {
// Get the current Git commit hash // Try to get Git commit hash from Railway environment variable first
let git_hash = std::env::var("RAILWAY_GIT_COMMIT_SHA").unwrap_or_else(|_| {
// Fallback to git command if not on Railway
let output = Command::new("git").args(["rev-parse", "HEAD"]).output(); let output = Command::new("git").args(["rev-parse", "HEAD"]).output();
match output {
let git_hash = match output {
Ok(output) => { Ok(output) => {
if output.status.success() { if output.status.success() {
String::from_utf8_lossy(&output.stdout).trim().to_string() String::from_utf8_lossy(&output.stdout).trim().to_string()
@@ -13,7 +14,8 @@ fn main() {
} }
} }
Err(_) => "unknown".to_string(), Err(_) => "unknown".to_string(),
}; }
});
// Get the short hash (first 7 characters) // Get the short hash (first 7 characters)
let short_hash = if git_hash != "unknown" && git_hash.len() >= 7 { let short_hash = if git_hash != "unknown" && git_hash.len() >= 7 {
@@ -26,7 +28,9 @@ fn main() {
println!("cargo:rustc-env=GIT_COMMIT_HASH={}", git_hash); println!("cargo:rustc-env=GIT_COMMIT_HASH={}", git_hash);
println!("cargo:rustc-env=GIT_COMMIT_SHORT={}", short_hash); println!("cargo:rustc-env=GIT_COMMIT_SHORT={}", short_hash);
// Rebuild if the Git commit changes // Rebuild if the Git commit changes (only works when .git directory is available)
if std::path::Path::new(".git/HEAD").exists() {
println!("cargo:rerun-if-changed=.git/HEAD"); println!("cargo:rerun-if-changed=.git/HEAD");
println!("cargo:rerun-if-changed=.git/refs/heads"); println!("cargo:rerun-if-changed=.git/refs/heads");
} }
}