From 397fafa16090dc2530449027a71143480d5cc336 Mon Sep 17 00:00:00 2001 From: bjorn3 <17426603+bjorn3@users.noreply.github.com> Date: Fri, 13 Jan 2023 13:51:51 +0000 Subject: [PATCH] Don't require git user to be configured for testing rust --- .github/workflows/nightly-cranelift.yml | 5 +---- .github/workflows/rustc.yml | 10 ++-------- scripts/setup_rust_fork.sh | 2 +- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/.github/workflows/nightly-cranelift.yml b/.github/workflows/nightly-cranelift.yml index 32a8ba9bcc9..8b3bfab7071 100644 --- a/.github/workflows/nightly-cranelift.yml +++ b/.github/workflows/nightly-cranelift.yml @@ -21,10 +21,7 @@ jobs: EOF - name: Prepare dependencies - run: | - git config --global user.email "user@example.com" - git config --global user.name "User" - ./y.rs prepare + run: ./y.rs prepare - name: Patch Cranelift run: | diff --git a/.github/workflows/rustc.yml b/.github/workflows/rustc.yml index 8844874ecb0..5faa8f05404 100644 --- a/.github/workflows/rustc.yml +++ b/.github/workflows/rustc.yml @@ -24,10 +24,7 @@ jobs: EOF - name: Prepare dependencies - run: | - git config --global user.email "user@example.com" - git config --global user.name "User" - ./y.rs prepare + run: ./y.rs prepare - name: Test run: ./scripts/test_bootstrap.sh @@ -51,10 +48,7 @@ jobs: EOF - name: Prepare dependencies - run: | - git config --global user.email "user@example.com" - git config --global user.name "User" - ./y.rs prepare + run: ./y.rs prepare - name: Test run: ./scripts/test_rustc_tests.sh diff --git a/scripts/setup_rust_fork.sh b/scripts/setup_rust_fork.sh index 88bc6445503..ce0d7e9fe07 100644 --- a/scripts/setup_rust_fork.sh +++ b/scripts/setup_rust_fork.sh @@ -10,7 +10,7 @@ git fetch git checkout -- . git checkout "$(rustc -V | cut -d' ' -f3 | tr -d '(')" -git am ../patches/*-sysroot-*.patch +git -c user.name=Dummy -c user.email=dummy@example.com am ../patches/*-sysroot-*.patch git apply - <