Skip to content

Commit 62be51c

Browse files
committed
.github: build vs-build with NO_GETTEXT
Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
1 parent de8defe commit 62be51c

File tree

1 file changed

+14
-32
lines changed

1 file changed

+14
-32
lines changed

.github/workflows/main.yml

Lines changed: 14 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -82,21 +82,12 @@ jobs:
8282
runs-on: windows-latest
8383
steps:
8484
- uses: actions/checkout@v1
85-
- name: download git-sdk-64-minimal
86-
shell: bash
87-
run: |
88-
## Get artifact
89-
urlbase=https://dev.azure.com/git-for-windows/git/_apis/build/builds
90-
id=$(curl "$urlbase?definitions=22&statusFilter=completed&resultFilter=succeeded&\$top=1" |
91-
jq -r ".value[] | .id")
92-
download_url="$(curl "$urlbase/$id/artifacts" |
93-
jq -r '.value[] | select(.name == "git-sdk-64-minimal").resource.downloadUrl')"
94-
curl --connect-timeout 10 --retry 5 --retry-delay 0 --retry-max-time 240 \
95-
-o artifacts.zip "$download_url"
96-
97-
## Unzip and remove the artifact
98-
unzip artifacts.zip
99-
rm artifacts.zip
85+
- name: Setup Git for Windows' minimal SDK
86+
uses: git-for-windows/setup-git-for-windows-sdk@v0
87+
with:
88+
flavor: minimal
89+
path: ./git-sdk-64-minimal
90+
cache: true
10091
- name: build
10192
shell: powershell
10293
env:
@@ -174,22 +165,13 @@ jobs:
174165
matrix:
175166
arch: [x64, arm64]
176167
steps:
177-
- uses: actions/checkout@v1
178-
- name: download git-sdk-64-minimal
179-
shell: bash
180-
run: |
181-
## Get artifact
182-
urlbase=https://dev.azure.com/git-for-windows/git/_apis/build/builds
183-
id=$(curl "$urlbase?definitions=22&statusFilter=completed&resultFilter=succeeded&\$top=1" |
184-
jq -r ".value[] | .id")
185-
download_url="$(curl "$urlbase/$id/artifacts" |
186-
jq -r '.value[] | select(.name == "git-sdk-64-minimal").resource.downloadUrl')"
187-
curl --connect-timeout 10 --retry 5 --retry-delay 0 --retry-max-time 240 \
188-
-o artifacts.zip "$download_url"
189-
190-
## Unzip and remove the artifact
191-
unzip artifacts.zip
192-
rm artifacts.zip
168+
- uses: actions/checkout@v2
169+
- name: Setup Git for Windows' minimal SDK
170+
uses: git-for-windows/setup-git-for-windows-sdk@v0
171+
with:
172+
flavor: minimal
173+
path: ./git-sdk-64-minimal
174+
cache: true
193175
- name: initialize vcpkg
194176
uses: actions/checkout@v2
195177
with:
@@ -215,7 +197,7 @@ jobs:
215197
shell: bash
216198
run: |
217199
cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/${{ matrix.arch }}-windows \
218-
-DMSGFMT_EXE=`pwd`/git-sdk-64-minimal/mingw64/bin/msgfmt.exe -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON -DCMAKE_GENERATOR_PLATFORM=${{ matrix.arch }} -DVCPKG_ARCH=${{ matrix.arch }}-windows
200+
-DNO_GETTEXT=YesPlease -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON -DCMAKE_GENERATOR_PLATFORM=${{ matrix.arch }} -DVCPKG_ARCH=${{ matrix.arch }}-windows
219201
- name: MSBuild
220202
run: msbuild git.sln -property:Configuration=Release -property:Platform=${{ matrix.arch }} -maxCpuCount:4 -property:PlatformToolset=v142
221203
- name: bundle artifact tar

0 commit comments

Comments
 (0)