File tree Expand file tree Collapse file tree 1 file changed +4
-7
lines changed
Expand file tree Collapse file tree 1 file changed +4
-7
lines changed Original file line number Diff line number Diff line change @@ -233,8 +233,10 @@ jobs:
233233 set -x
234234 if test ! -d /usr/src/MINGW-packages
235235 then
236- git clone --depth 1 --single-branch -b main \
237- https://github.com/git-for-windows/MINGW-packages /usr/src/MINGW-packages
236+ git clone --depth 1 --single-branch -b prepare-for-upstreaming-to-msys2 \
237+ https://github.com/git-for-windows/MINGW-packages /usr/src/MINGW-packages &&
238+ git -C /usr/src/MINGW-packages branch -m main &&
239+ git -C /usr/src/MINGW-packages update-ref refs/remotes/origin/main HEAD
238240 fi &&
239241 cd /usr/src/MINGW-packages/mingw-w64-git &&
240242 if test ! -d git
@@ -285,11 +287,6 @@ jobs:
285287 app-id : ${{ secrets.GH_APP_ID }}
286288 private-key : ${{ secrets.GH_APP_PRIVATE_KEY }}
287289 append-text : ' About to build the `${{env.MINGW_PACKAGE_PREFIX}}-git` package'
288- - name : Use development branch of MINGW-packages
289- run : |
290- set -x
291- git clone --depth 1 --single-branch -b prepare-for-upstreaming-to-msys2 https://github.com/git-for-windows/MINGW-packages /usr/src/MINGW-packages &&
292- git -C /usr/src/MINGW-packages branch -m main
293290 - name : Build ${{env.MINGW_PACKAGE_PREFIX}}-git
294291 timeout-minutes : 60
295292 if : steps.restore-cached-git-pkg.outputs.cache-hit != 'true'
You can’t perform that action at this time.
0 commit comments