Skip to content

Commit 313cb00

Browse files
committed
Revert "Revert back proxmox-i18n before the submodules breakage"
This reverts commit 3c05c6f.
1 parent 0f9d20e commit 313cb00

File tree

8 files changed

+213
-4
lines changed

8 files changed

+213
-4
lines changed

dockerfiles/Dockerfile.build

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,13 @@ ENV CARGO_HOME=/cargo \
1818
RUN wget https://static.rust-lang.org/rustup/rustup-init.sh && \
1919
chmod +x rustup-init.sh && \
2020
./rustup-init.sh -y && \
21-
cargo install debcargo && \
21+
cargo install debcargo cargo-deb && \
2222
rustc --version
2323

24+
# Install extra packages
25+
ADD packages/ /src/packages/
26+
RUN cargo deb --manifest-path /src/packages/xtr/Cargo.toml --install
27+
2428
# Specify default rust toolchain
2529
ENV RUSTUP_TOOLCHAIN=1.87
2630

@@ -29,8 +33,7 @@ RUN ln -s /cargo/bin/* /usr/local/bin/
2933
ADD /scripts/toolchain/ /usr/local/bin/
3034

3135
WORKDIR /src
32-
RUN git config --system user.email "[email protected]" && \
33-
git config --system user.name "Docker Compile"
36+
ADD dockerfiles/gitconfig /etc/gitconfig
3437

3538
FROM toolchain as builder
3639

dockerfiles/gitconfig

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
[user]
2+
3+
name = Docker Compile
4+
5+
[url "git://git.proxmox.com/git/ui/proxmox-yew-widget-toolkit-assets.git"]
6+
insteadOf = [email protected]:yew/proxmox-yew-widget-toolkit-assets
7+
8+
[url "git://git.proxmox.com/git/proxmox-api-types.git"]
9+
insteadOf = [email protected]:/rust/proxmox-api-types
10+
11+
[url "git://git.proxmox.com/git/ui/proxmox-yew-widget-toolkit-assets.git"]
12+
insteadOf = [email protected]:yew/proxmox-yew-widget-toolkit-assets

packages/xtr/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
target/

packages/xtr/Cargo.lock

Lines changed: 145 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/xtr/Cargo.toml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
[package]
2+
name = "xtr"
3+
version = "0.1.11"
4+
edition = "2021"
5+
authors = ["Kamil Trzciński <[email protected]>"]
6+
description = "deb for xtr binary"
7+
build = "build.rs"
8+
9+
[package.metadata.deb]
10+
maintainer = "Kamil Trzciński <[email protected]>"
11+
depends = "$auto"
12+
section = "utils"
13+
priority = "optional"
14+
assets = [
15+
["target/deps/bin/xtr", "usr/bin/", "755"]
16+
]
17+
18+
[lib]
19+
path = "src/lib.rs" # Can be empty or minimal
20+
21+
[build-dependencies]
22+
toml = "0.7"

packages/xtr/build.rs

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
use std::{fs, process::Command};
2+
3+
fn main() {
4+
let cargo_toml = fs::read_to_string("Cargo.toml").expect("Failed to read Cargo.toml");
5+
let cargo_toml: toml::Value = toml::from_str(&cargo_toml).expect("Failed to parse Cargo.toml");
6+
7+
let crate_name = cargo_toml["package"]["name"].as_str().expect("Missing extra crate name");
8+
let crate_version = cargo_toml["package"]["version"].as_str().expect("Missing extra crate version");
9+
10+
let crate_with_version = format!("{}@{}", crate_name, crate_version);
11+
12+
let status = Command::new("cargo")
13+
.args(&[
14+
"install",
15+
&crate_with_version,
16+
"--root",
17+
"target/deps",
18+
"--locked",
19+
])
20+
.status()
21+
.expect("Failed to run cargo install for extra crate");
22+
23+
if !status.success() {
24+
panic!("cargo install for extra crate failed");
25+
}
26+
}

packages/xtr/src/lib.rs

Whitespace-only changes.

repos/deps

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ proxmox-backup e17239734487b54111a92c88703727c0ccc98c3b # Thu Aug 7 18:39:03 202
22
proxmox-mini-journalreader b09ee543344fb7082a27346ecb0008f38af6367d # Tue Jun 3 20:58:30 2025 +0200
33
proxmox-widget-toolkit 230fb4d0d15b348253aa53cfe169d0066e4f1647 # Wed Aug 6 12:01:37 2025 +0200
44
extjs 18909118c3d316f0bb48846920b8c94a4efc31f5 # Thu Nov 14 17:31:34 2024 +0100
5-
proxmox-i18n 288ab310ecb96c96307b8b68ace126b8cf6390de # Wed Jul 23 14:38:47 2025 +0200
5+
proxmox-i18n fb915865e0207bd1ef37f17eea8fd9a54e8fcbcd # Wed Aug 6 13:53:16 2025 +0200
66
pve-xtermjs c69379f49db91429eb01ea56b47f2a2832fec8e7 # Wed Jun 25 15:29:14 2025 +0200
77
libjs-qrcodejs a9906bd488b5c2045ea4aa8b014d97fdccad63b9 # Thu May 25 14:25:53 2023 +0200
88
proxmox-acme 6dc96d5a468d1553991589f4197f9ec6eab554c1 # Sun Jun 1 16:51:41 2025 +0200

0 commit comments

Comments
 (0)