Skip to content

Commit 8d456a7

Browse files
committed
.github/workflows,script/cibuild: drop custom Perl
Since commit c591ff7 of PR git-lfs#3125 we have installed Strawberry Perl before running our CI test suite on Windows. This was necessary when we used the AppVeyor service to run our test suite on Windows, and subsequently also when we converted our CI jobs to GitHub Actions in PR git-lfs#3808. We require Perl because we use the "prove" command, which runs all of our t/t-*.sh test scripts and collects and summarizes the results. However, since commit 8818630 of PR git-lfs#5666 we have installed the Git for Windows SDK before running our test suite, and it includes a full Perl distribution, which means we no longer need to install Strawberry Perl separately.
1 parent 12ab25b commit 8d456a7

File tree

3 files changed

+0
-8
lines changed

3 files changed

+0
-8
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ jobs:
8181
shell: bash
8282
- run: set GOPATH=%HOME%\go
8383
- run: choco install -y InnoSetup
84-
- run: choco install -y strawberryperl
8584
- run: make man
8685
shell: bash
8786
- run: GOPATH="$HOME/go" PATH="$HOME/go/bin:$PATH" go install github.com/josephspurrier/goversioninfo/cmd/goversioninfo@latest

.github/workflows/release.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ jobs:
3333
shell: bash
3434
- run: set GOPATH=%HOME%\go
3535
- run: choco install -y InnoSetup
36-
- run: choco install -y strawberryperl
3736
- run: choco install -y zip
3837
- run: choco install -y jq
3938
- run: GOPATH="$HOME/go" PATH="$HOME/go/bin:$PATH" go install github.com/josephspurrier/goversioninfo/cmd/goversioninfo@latest

script/cibuild

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,6 @@ GIT_TRACE=1 make GOIMPORTS="$GOIMPORTS" PKGS=git test
3030
pushd t >/dev/null
3131
PROVE="prove"
3232
PROVE_EXTRA_ARGS="-j9"
33-
if [ "$WINDOWS" ]; then
34-
export PATH="/c/Strawberry/perl/bin:.:$PATH"
35-
PROVE="prove.bat"
36-
PROVE_EXTRA_ARGS="$PROVE_EXTRA_ARGS --exec bash"
37-
fi
38-
3933
VERBOSE_LOGS=1 make X="$X" clean
4034
VERBOSE_LOGS=1 make X="$X" PROVE="$PROVE" PROVE_EXTRA_ARGS="$PROVE_EXTRA_ARGS"
4135
popd >/dev/null

0 commit comments

Comments
 (0)