Skip to content

Commit 1acefe1

Browse files
committed
chore: rename vendored artifact root to vendor/cargo
1 parent 59a479d commit 1acefe1

25 files changed

+27
-25
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
- "crates/**/*.rs"
1414
- "crates/**/Cargo.toml"
1515
- "scripts/release/*.sh"
16-
- "third_party/cargo/**"
16+
- "vendor/cargo/**"
1717
- ".github/workflows/test.yml"
1818

1919
pull_request:
@@ -26,7 +26,7 @@ on:
2626
- "crates/**/*.rs"
2727
- "crates/**/Cargo.toml"
2828
- "scripts/release/*.sh"
29-
- "third_party/cargo/**"
29+
- "vendor/cargo/**"
3030
- ".github/workflows/test.yml"
3131

3232
# Cancel in progress workflow when a new one is triggered by running in a concurrency group
@@ -71,7 +71,7 @@ jobs:
7171
CHANGED_FILES="$(git diff --name-only "$BASE_SHA" "$HEAD_SHA")"
7272
7373
if echo "$CHANGED_FILES" | grep -q "^Cargo.lock$"; then
74-
if ! echo "$CHANGED_FILES" | grep -Eq "^third_party/cargo/(vendor\.tar\.gz\.part-[0-9]+|vendor\.tar\.gz\.sha256|VENDOR_MANIFEST\.lock)$"; then
74+
if ! echo "$CHANGED_FILES" | grep -Eq "^vendor/cargo/(vendor\.tar\.gz\.part-[0-9]+|vendor\.tar\.gz\.sha256|VENDOR_MANIFEST\.lock)$"; then
7575
echo "Cargo.lock changed but vendored dependency artifacts were not refreshed."
7676
echo "Run: make vendor-refresh"
7777
exit 1

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ crates/contracts/build/
4141

4242
**/.claude/settings.local.json
4343

44-
vendor
44+
vendor/*
45+
!vendor/cargo/
46+
!vendor/cargo/**
4547
katana-tee
4648

4749
# AMDSEV build artifacts

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@ cargo nextest run
108108

109109
Katana release binaries are built from a vendored Cargo dependency archive committed in this repository:
110110

111-
- `third_party/cargo/vendor.tar.gz.part-*`
112-
- `third_party/cargo/vendor.tar.gz.sha256`
113-
- `third_party/cargo/VENDOR_MANIFEST.lock`
111+
- `vendor/cargo/vendor.tar.gz.part-*`
112+
- `vendor/cargo/vendor.tar.gz.sha256`
113+
- `vendor/cargo/VENDOR_MANIFEST.lock`
114114

115115
The archive is committed as split parts to stay under GitHub's per-file size limit.
116116

docs/release-reproducibility.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ Katana release binaries use a vendored Cargo dependency archive to reduce non-de
44

55
## Vendored Artifacts
66

7-
- `third_party/cargo/vendor.tar.gz.part-*`
8-
- `third_party/cargo/vendor.tar.gz.sha256`
9-
- `third_party/cargo/VENDOR_MANIFEST.lock`
7+
- `vendor/cargo/vendor.tar.gz.part-*`
8+
- `vendor/cargo/vendor.tar.gz.sha256`
9+
- `vendor/cargo/VENDOR_MANIFEST.lock`
1010

1111
The archive is stored as split parts to remain below GitHub's per-file blob limit.
1212

@@ -27,9 +27,9 @@ make vendor-refresh
2727
Commit all of the following in the same PR:
2828

2929
- `Cargo.lock`
30-
- `third_party/cargo/vendor.tar.gz.part-*`
31-
- `third_party/cargo/vendor.tar.gz.sha256`
32-
- `third_party/cargo/VENDOR_MANIFEST.lock`
30+
- `vendor/cargo/vendor.tar.gz.part-*`
31+
- `vendor/cargo/vendor.tar.gz.sha256`
32+
- `vendor/cargo/VENDOR_MANIFEST.lock`
3333

3434
## Validation
3535

scripts/release/build-katana-vendored.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ TARGET=""
99
PROFILE="${PROFILE:-performance}"
1010
NATIVE_BUILD=0
1111

12-
VENDOR_DIR="${VENDOR_DIR:-$PROJECT_ROOT/third_party/cargo}"
12+
VENDOR_DIR="${VENDOR_DIR:-$PROJECT_ROOT/vendor/cargo}"
1313
VENDOR_ARCHIVE_NAME="${VENDOR_ARCHIVE_NAME:-vendor.tar.gz}"
1414
VERIFY_SCRIPT="$SCRIPT_DIR/verify-vendor-archive.sh"
1515

scripts/release/update-vendor-archive.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -euo pipefail
55
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
66
PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
77

8-
VENDOR_DIR="$PROJECT_ROOT/third_party/cargo"
8+
VENDOR_DIR="$PROJECT_ROOT/vendor/cargo"
99
VENDOR_ARCHIVE_NAME="${VENDOR_ARCHIVE_NAME:-vendor.tar.gz}"
1010
VENDOR_PART_PREFIX="${VENDOR_PART_PREFIX:-$VENDOR_DIR/${VENDOR_ARCHIVE_NAME}.part-}"
1111
VENDOR_PART_SIZE="${VENDOR_PART_SIZE:-95m}"
@@ -153,16 +153,16 @@ cat > "$VENDOR_MANIFEST_FILE" <<EOF
153153
manifest_version=1
154154
cargo_lock_path=Cargo.lock
155155
cargo_lock_sha256=$CARGO_LOCK_SHA256
156-
vendor_archive_path=third_party/cargo/$VENDOR_ARCHIVE_NAME
156+
vendor_archive_path=vendor/cargo/$VENDOR_ARCHIVE_NAME
157157
vendor_archive_sha256=$VENDOR_ARCHIVE_SHA256
158-
vendor_archive_sha256_file=third_party/cargo/$(basename "$VENDOR_ARCHIVE_SHA256_FILE")
159-
vendor_archive_part_prefix=third_party/cargo/${VENDOR_ARCHIVE_NAME}.part-
158+
vendor_archive_sha256_file=vendor/cargo/$(basename "$VENDOR_ARCHIVE_SHA256_FILE")
159+
vendor_archive_part_prefix=vendor/cargo/${VENDOR_ARCHIVE_NAME}.part-
160160
source_date_epoch=$SOURCE_DATE_EPOCH
161161
generated_by=scripts/release/update-vendor-archive.sh
162162
EOF
163163

164164
echo "Vendor archive updated."
165165
echo "Files to commit:"
166-
echo " - third_party/cargo/${VENDOR_ARCHIVE_NAME}.part-* ($PART_COUNT files)"
167-
echo " - third_party/cargo/$(basename "$VENDOR_ARCHIVE_SHA256_FILE")"
168-
echo " - third_party/cargo/$(basename "$VENDOR_MANIFEST_FILE")"
166+
echo " - vendor/cargo/${VENDOR_ARCHIVE_NAME}.part-* ($PART_COUNT files)"
167+
echo " - vendor/cargo/$(basename "$VENDOR_ARCHIVE_SHA256_FILE")"
168+
echo " - vendor/cargo/$(basename "$VENDOR_MANIFEST_FILE")"

scripts/release/verify-vendor-archive.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -euo pipefail
55
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
66
PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
77

8-
VENDOR_DIR="$PROJECT_ROOT/third_party/cargo"
8+
VENDOR_DIR="$PROJECT_ROOT/vendor/cargo"
99
VENDOR_ARCHIVE_NAME="${VENDOR_ARCHIVE_NAME:-vendor.tar.gz}"
1010
VENDOR_PART_GLOB="${VENDOR_PART_GLOB:-$VENDOR_DIR/${VENDOR_ARCHIVE_NAME}.part-*}"
1111
VENDOR_ARCHIVE_SHA256_FILE="${VENDOR_ARCHIVE_SHA256_FILE:-$VENDOR_DIR/vendor.tar.gz.sha256}"
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
manifest_version=1
22
cargo_lock_path=Cargo.lock
33
cargo_lock_sha256=d68486924d65e41aa0f4d342db8fd39ab4a5d3d519e0e79ae7939a15674b5bac
4-
vendor_archive_path=third_party/cargo/vendor.tar.gz
4+
vendor_archive_path=vendor/cargo/vendor.tar.gz
55
vendor_archive_sha256=7f54d37e1cd5c1c7d0ea8f0eacd167ce36199cd2bc8def36762f6314eab86ee8
6-
vendor_archive_sha256_file=third_party/cargo/vendor.tar.gz.sha256
7-
vendor_archive_part_prefix=third_party/cargo/vendor.tar.gz.part-
6+
vendor_archive_sha256_file=vendor/cargo/vendor.tar.gz.sha256
7+
vendor_archive_part_prefix=vendor/cargo/vendor.tar.gz.part-
88
source_date_epoch=0
99
generated_by=scripts/release/update-vendor-archive.sh

0 commit comments

Comments
 (0)