Skip to content

Commit be5109f

Browse files
committed
Support building packages from git-for-windows/MINGW-packages
This is probably even more important than supporting to build the packages from git-for-windows/build-extra. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 9da75b0 commit be5109f

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

.github/workflows/build-and-deploy.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: build-and-deploy
2-
run-name: Build${{ inputs.build_only == '' && ' and deploy' || '' }} ${{ inputs.package }}
2+
run-name: Build${{ inputs.build_only == '' && ' and deploy' || '' }} ${{ !startsWith(inputs.package, 'mingw-w64-') && inputs.repo != 'MSYS2-packages' && inputs.package != 'git-extra' && inputs.package != 'git-for-windows-keyring' && 'mingw-w64-' || '' }}${{ inputs.package }}
33

44
on:
55
workflow_dispatch:
@@ -124,14 +124,19 @@ jobs:
124124
with:
125125
flavor: full
126126

127-
- name: Clone build-extra
127+
- name: Clone ${{ env.REPO }}
128128
shell: bash
129129
run: |
130130
mkdir -p /usr/src &&
131-
git init -b main /usr/src/build-extra &&
132-
git -C /usr/src/build-extra remote add origin "https://github.com/$OWNER/$REPO" &&
133-
git -C /usr/src/build-extra fetch --depth 1 origin $REF &&
134-
git -C /usr/src/build-extra switch -d FETCH_HEAD
131+
git init -b main /usr/src/${{ env.REPO }} &&
132+
git -C /usr/src/${{ env.REPO }} remote add origin "https://github.com/$OWNER/$REPO" &&
133+
git -C /usr/src/${{ env.REPO }} fetch --depth 1 origin $REF &&
134+
git -C /usr/src/${{ env.REPO }} reset --hard FETCH_HEAD
135+
136+
- name: Clone build-extra (unless cloned already)
137+
if: env.REPO != 'build-extra'
138+
shell: bash
139+
run: git clone --depth 1 --single-branch -b main https://github.com/git-for-windows/build-extra /usr/src/build-extra
135140

136141
- name: pacman -Syyu
137142
shell: bash

0 commit comments

Comments
 (0)