Skip to content

Commit 16337e4

Browse files
committed
Revert "TO-DROP: clone build-extra from dscho/please-sh-tolerate-missing-sparse"
This reverts commit 075a9ad. The build-extra changes that this commit was waiting on (git-for-windows/build-extra#710) have landed on `git-for-windows/build-extra` `main`, so the workflows can go back to cloning the upstream branch. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent 8cfe32e commit 16337e4

2 files changed

Lines changed: 3 additions & 15 deletions

File tree

.github/workflows/check-for-missing-dlls.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,7 @@ jobs:
2929
env:
3030
REF: ${{github.ref}}
3131
- name: clone build-extra
32-
shell: bash
33-
run: |
34-
git clone --depth=1 --single-branch \
35-
-b please-sh-tolerate-missing-sparse \
36-
https://github.com/dscho/build-extra
32+
run: git clone --depth=1 --single-branch -b main https://github.com/git-for-windows/build-extra
3733
- name: create build-installers artifact
3834
shell: bash
3935
run: |

.github/workflows/ci-artifacts.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,7 @@ jobs:
3030
git --git-dir=git-sdk-64.git fetch --depth=1 origin ${{github.sha}} &&
3131
git --git-dir=git-sdk-64.git update-ref --no-deref HEAD ${{github.sha}}
3232
- name: clone build-extra
33-
shell: bash
34-
run: |
35-
git clone --depth=1 --single-branch \
36-
-b please-sh-tolerate-missing-sparse \
37-
https://github.com/dscho/build-extra
33+
run: git clone --depth=1 --single-branch -b main https://github.com/git-for-windows/build-extra
3834
- name: build git-sdk-64-minimal-sdk
3935
shell: bash
4036
run: |
@@ -109,11 +105,7 @@ jobs:
109105
git --git-dir=git-sdk-64.git fetch --depth=1 origin ${{github.sha}} &&
110106
git --git-dir=git-sdk-64.git update-ref --no-deref HEAD ${{github.sha}}
111107
- name: clone build-extra
112-
shell: bash
113-
run: |
114-
git clone --depth=1 --single-branch \
115-
-b please-sh-tolerate-missing-sparse \
116-
https://github.com/dscho/build-extra
108+
run: git clone --depth=1 --single-branch -b main https://github.com/git-for-windows/build-extra
117109
- name: build git-sdk-64-build-installers
118110
shell: bash
119111
run: sh -x ./build-extra/please.sh create-sdk-artifact --architecture=ucrt64 --sdk=git-sdk-64.git build-installers

0 commit comments

Comments
 (0)