From c770284e41058bc56ef4b27d9d0b1c1ed81593c5 Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 8 Aug 2024 22:04:50 +0800 Subject: [PATCH 1/2] fix(ci/mass-rebuild): rename git repo --- .github/workflows/mass-rebuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mass-rebuild.yml b/.github/workflows/mass-rebuild.yml index 75de12b..d4f877e 100644 --- a/.github/workflows/mass-rebuild.yml +++ b/.github/workflows/mass-rebuild.yml @@ -26,7 +26,7 @@ jobs: id: generate_build_matrix # generate build matrix by checking out changes in ultramarine/ run: | - git config --global --add safe.directory /__w/ultramarine-pkgs/ultramarine-pkgs + git config --global --add safe.directory /__w/packages/packages git config --global user.email "you@example.com" git config --global user.name "Your Name" init=$(git rev-list HEAD | tail -n 1) From ac8b09283dad9a2f3d6115af6385108238b6c573 Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 8 Aug 2024 22:08:18 +0800 Subject: [PATCH 2/2] fix(ci/mass-rebuild): generate binary patch --- .github/workflows/mass-rebuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mass-rebuild.yml b/.github/workflows/mass-rebuild.yml index d4f877e..cc4f5c2 100644 --- a/.github/workflows/mass-rebuild.yml +++ b/.github/workflows/mass-rebuild.yml @@ -30,7 +30,7 @@ jobs: git config --global user.email "you@example.com" git config --global user.name "Your Name" init=$(git rev-list HEAD | tail -n 1) - git diff ${init}..HEAD > a.diff + git diff ${init}..HEAD --binary > a.diff git checkout $init git apply a.diff git add *