Unverified Commit a8dc24f1 authored by Sebastian "Sebbie" Silbermann's avatar Sebastian "Sebbie" Silbermann Committed by GitHub

[backport] Turbopack: more strict vergen setup (#93587)

Co-authored-by: 's avatarNiklas Mischkulnig <4586894+mischnic@users.noreply.github.com>
Co-authored-by: 's avatarTobias Koppers <tobias.koppers@googlemail.com>
parent 766148f9
...@@ -231,6 +231,9 @@ jobs: ...@@ -231,6 +231,9 @@ jobs:
# environment. # environment.
docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:stable-2023-09-17-x64 docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:stable-2023-09-17-x64
build: | build: |
# /build is bind-mounted from the host with a uid that differs from the
# container's root user; mark it safe so vergen's `git rev-parse` works.
git config --global --add safe.directory /build
rm /usr/share/keyrings/nodesource.gpg rm /usr/share/keyrings/nodesource.gpg
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key \ curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key \
| gpg --dearmor -o /usr/share/keyrings/nodesource.gpg | gpg --dearmor -o /usr/share/keyrings/nodesource.gpg
...@@ -250,6 +253,9 @@ jobs: ...@@ -250,6 +253,9 @@ jobs:
target: 'x86_64-unknown-linux-musl' target: 'x86_64-unknown-linux-musl'
docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:stable-2023-09-17-alpine docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:stable-2023-09-17-alpine
build: | build: |
# /build is bind-mounted from the host with a uid that differs from the
# container's root user; mark it safe so vergen's `git rev-parse` works.
git config --global --add safe.directory /build
apk update apk update
apk del llvm apk del llvm
apk add --no-cache libc6-compat pkgconfig dav1d libdav1d dav1d-dev clang20-static llvm20 llvm20-dev apk add --no-cache libc6-compat pkgconfig dav1d libdav1d dav1d-dev clang20-static llvm20 llvm20-dev
...@@ -266,6 +272,9 @@ jobs: ...@@ -266,6 +272,9 @@ jobs:
target: 'aarch64-unknown-linux-gnu' target: 'aarch64-unknown-linux-gnu'
docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:stable-2023-09-17-aarch64 docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:stable-2023-09-17-aarch64
build: | build: |
# /build is bind-mounted from the host with a uid that differs from the
# container's root user; mark it safe so vergen's `git rev-parse` works.
git config --global --add safe.directory /build
rm /usr/share/keyrings/nodesource.gpg rm /usr/share/keyrings/nodesource.gpg
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key \ curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key \
| gpg --dearmor -o /usr/share/keyrings/nodesource.gpg | gpg --dearmor -o /usr/share/keyrings/nodesource.gpg
...@@ -287,6 +296,9 @@ jobs: ...@@ -287,6 +296,9 @@ jobs:
target: 'aarch64-unknown-linux-musl' target: 'aarch64-unknown-linux-musl'
docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:stable-2023-09-17-alpine docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:stable-2023-09-17-alpine
build: | build: |
# /build is bind-mounted from the host with a uid that differs from the
# container's root user; mark it safe so vergen's `git rev-parse` works.
git config --global --add safe.directory /build
apk update apk update
apk del llvm apk del llvm
apk add --no-cache libc6-compat pkgconfig dav1d libdav1d dav1d-dev clang20-static llvm20 llvm20-dev apk add --no-cache libc6-compat pkgconfig dav1d libdav1d dav1d-dev clang20-static llvm20 llvm20-dev
......
...@@ -6,8 +6,8 @@ fn main() -> anyhow::Result<()> { ...@@ -6,8 +6,8 @@ fn main() -> anyhow::Result<()> {
.target_triple(true) .target_triple(true)
.build()?; .build()?;
vergen::Emitter::default() vergen::Emitter::default()
.add_instructions(&cargo)?
.fail_on_error() .fail_on_error()
.add_instructions(&cargo)?
.emit()?; .emit()?;
Ok(()) Ok(())
......
...@@ -57,9 +57,9 @@ fn main() -> anyhow::Result<()> { ...@@ -57,9 +57,9 @@ fn main() -> anyhow::Result<()> {
) )
.build()?; .build()?;
vergen_gitcl::Emitter::default() vergen_gitcl::Emitter::default()
.fail_on_error()
.add_instructions(&cargo)? .add_instructions(&cargo)?
.add_instructions(&git)? .add_instructions(&git)?
.fail_on_error()
.emit()?; .emit()?;
match Command::new("git").args(["rev-parse", "HEAD"]).output() { match Command::new("git").args(["rev-parse", "HEAD"]).output() {
...@@ -67,7 +67,12 @@ fn main() -> anyhow::Result<()> { ...@@ -67,7 +67,12 @@ fn main() -> anyhow::Result<()> {
"cargo:warning=git HEAD: {}", "cargo:warning=git HEAD: {}",
str::from_utf8(&out.stdout).unwrap() str::from_utf8(&out.stdout).unwrap()
), ),
_ => println!("cargo:warning=`git rev-parse HEAD` failed"), Ok(out) => println!(
"cargo:warning=`git rev-parse HEAD` failed with status {}: {}",
out.status,
str::from_utf8(&out.stderr).unwrap()
),
Err(e) => println!("cargo:warning=`git rev-parse HEAD` could not be spawned: {e}"),
} }
if !is_macos_target { if !is_macos_target {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment