Skip to content

Commit df28817

Browse files
ayufanmarcinmajsc
andauthored
Bump to v4.0.18 (#101)
- Added path check condition for dependencies - Adapting the script to the current perlmod structure. - Skip virtual manifests (workspaces without a [package] section). They do not correspond to an actual crate and would otherwise override the real crate directory in the found_deps map (e.g. perlmod now being a workspace). Co-authored-by: Marcin Maj <[email protected]>
1 parent 92199c7 commit df28817

File tree

7 files changed

+22
-18
lines changed

7 files changed

+22
-18
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v4.0.13
1+
v4.0.18

dockerfiles/Dockerfile.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ADD packages/ /src/packages/
2626
RUN cargo deb --manifest-path /src/packages/xtr/Cargo.toml --install
2727

2828
# Specify default rust toolchain
29-
ENV RUSTUP_TOOLCHAIN=1.87
29+
ENV RUSTUP_TOOLCHAIN=1.88
3030

3131
# Link /cargo/bin to /usr/local/bin
3232
RUN ln -s /cargo/bin/* /usr/local/bin/
@@ -52,7 +52,7 @@ RUN ./scripts/build/make.bash proxmox-mini-journalreader make_deb
5252
RUN ./scripts/build/make.bash libjs-qrcodejs make_deb
5353
RUN ./scripts/build/make.bash proxmox-acme make_deb
5454
RUN ./scripts/build/make.bash pve-xtermjs "make_deb termproxy" "make_deb xterm.js"
55-
RUN ./scripts/build/make.bash proxmox-backup --rust 1.85 make_deb
55+
RUN ./scripts/build/make.bash proxmox-backup --rust 1.88 make_deb
5656

5757
#=================================
5858

dockerfiles/Dockerfile.client

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ RUN wget https://static.rust-lang.org/rustup/rustup-init.sh && \
2525
for tool in /root/.cargo/bin/*; do ln -vsf $tool /usr/bin/; done;
2626

2727
# Specify default rust toolchain
28-
ENV RUSTUP_TOOLCHAIN=1.85
28+
ENV RUSTUP_TOOLCHAIN=1.88
2929

3030
# Apply all patches
3131
ADD /scripts/build /src/scripts/build

repos/deps

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
proxmox-backup de92e3f6a26bfbcc9f8b860e983a85a434a8e3c6 # Mon Aug 11 15:05:27 2025 +0200
1+
proxmox-backup 2586548f25af89b6bce80a2886bd0e7748000ea2 # Wed Oct 22 13:23:35 2025 +0200
22
proxmox-mini-journalreader b09ee543344fb7082a27346ecb0008f38af6367d # Tue Jun 3 20:58:30 2025 +0200
3-
proxmox-widget-toolkit 230fb4d0d15b348253aa53cfe169d0066e4f1647 # Wed Aug 6 12:01:37 2025 +0200
3+
proxmox-widget-toolkit d9b4bf9e77dabc8bba022d18d1f4d6cf6a0b5ac9 # Fri Oct 3 14:27:07 2025 +0200
44
extjs 18909118c3d316f0bb48846920b8c94a4efc31f5 # Thu Nov 14 17:31:34 2024 +0100
5-
proxmox-i18n 542c9515ca4617facbb7e0e7debe08203fdda40e # Mon Aug 11 14:04:18 2025 +0200
5+
proxmox-i18n e4c5b31a4042e84751c53e42052f48a8089ac40b # Wed Oct 15 10:40:56 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
99
pve-eslint bc248701f19280d5a5d39131687dd357da057d8b # Wed Aug 30 11:42:24 2023 +0200
10-
pve-common 6f7de20bb9eb2485c57a66ef87f65462cb3152be # Fri Aug 8 11:58:26 2025 +0200
11-
proxmox-perl-rs f2fbed015ec15d204193bcb751388d8acd3bf6ef # Thu Aug 7 10:21:08 2025 +0200
12-
perlmod cd32f4813577ef73c7a5316c15ec96d643250cf8 # Thu Aug 7 16:10:15 2025 +0200
10+
pve-common dcf1836b6844976d60b71d0655b926cc1bdf2fe9 # Wed Oct 8 21:41:25 2025 +0200
11+
proxmox-perl-rs 71f6001f13f87c376eda475ba0960c03166b15bb # Mon Sep 22 10:24:32 2025 +0200
12+
perlmod c1078ed251704b6c79225e1a788d93fcd57d748e # Thu Oct 9 11:52:12 2025 +0200
1313
proxmox-biome c23fa7b8027b344325a65a0ae9a071180a8e800c # Thu Jul 24 18:44:47 2025 +0200

repos/proxmox-backup.deps

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
proxmox-backup de92e3f6a26bfbcc9f8b860e983a85a434a8e3c6 # Mon Aug 11 15:05:27 2025 +0200
2-
proxmox 84a58afe23a35454a1abbeb6c436ee49d2888d18 # Mon Aug 11 14:34:44 2025 +0200
1+
proxmox-backup 2586548f25af89b6bce80a2886bd0e7748000ea2 # Wed Oct 22 13:23:35 2025 +0200
2+
proxmox 4eb5517830ae58ca522bfe9f90abac1753579889 # Tue Oct 21 20:36:31 2025 +0200
33
proxmox-fuse 87dbf9bfef9169286263bccffaae3206635ca108 # Wed Jun 11 15:32:59 2025 +0200
44
pathpatterns 5323cbe49ae5d592eb8a3fa2e215550e83dd7fba # Thu Jul 31 14:09:48 2025 +0200
5-
pxar 993c66fcb8819770f279cb9fb4d13f58f367606c # Wed Jun 11 14:41:16 2025 +0200
5+
pxar 957acc8917294a62d829d51e06cff9dc88845fb3 # Mon Sep 8 11:24:54 2025 +0200

repos/proxmox-perl-rs.deps

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
proxmox-perl-rs f2fbed015ec15d204193bcb751388d8acd3bf6ef # Thu Aug 7 10:21:08 2025 +0200
2-
proxmox 7de539b26cbca1bdc2a24f3591e59469d95746e1 # Thu Aug 7 10:18:21 2025 +0200
1+
proxmox-perl-rs 71f6001f13f87c376eda475ba0960c03166b15bb # Mon Sep 22 10:24:32 2025 +0200
2+
proxmox 46da97402c2fbc9582bace50250343c0e8affffb # Mon Sep 15 21:17:23 2025 +0200
33
proxmox-resource-scheduling ee5fedf98b7e110c5a11bb11cc8e657122065606 # Sat May 31 16:09:19 2025 +0200
4-
perlmod 3544b62fc1b74a4bc036fc2ba19a54b71452f8e4 # Thu Jul 31 14:10:34 2025 +0200
5-
proxmox-ve-rs ac7285715b37f6304a2e60ba1d3d98f95eb422dd # Tue Aug 5 12:22:46 2025 +0200
4+
perlmod 244d547be4df2b697c3d3f76273ff5cbeed7531c # Fri Sep 12 13:57:39 2025 +0200
5+
proxmox-ve-rs 1519c03b35eeaa5942ee2ce868a6d15cfcbba741 # Thu Sep 4 15:20:56 2025 +0200

scripts/build/resolve-dependencies.bash

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,15 @@ echo "Resolving dependencies in $search_dir"
1616

1717
while read cargo_path; do
1818
cargo_path=$(dirname "$cargo_path")
19+
cargo_toml="$cargo_path/Cargo.toml"
20+
if ! grep -Eq '^[[:space:]]*\[package\]' "$cargo_toml"; then
21+
continue
22+
fi
1923
cargo_dep=$(basename "$cargo_path")
2024
git_repo=$(git -C "$cargo_path" rev-parse --show-toplevel)
2125
found_deps[$cargo_dep]="$cargo_path"
2226
git_deps[$cargo_dep]="$git_repo"
23-
got_deps[$(realpath "$cargo_path/Cargo.toml")]="$(get_deps "$cargo_path/Cargo.toml" | sort -u)"
27+
got_deps[$(realpath "$cargo_toml")]="$(get_deps "$cargo_toml" | sort -u)"
2428
done < <(find "$PWD" -wholename "*/Cargo.toml" -not -path "*/vendor/*" -not -path "*/.build/*")
2529

2630
echo "Found dependencies:"

0 commit comments

Comments
 (0)