Skip to content

Commit 12a1513

Browse files
avargitster
authored andcommitted
CI: invoke "make artifacts-tar" directly in windows-build
Change the windows-build job to invoke the "make artifacts-tar" step directly, instead of calling a "ci/make-test-artifacts.sh" script. The script was needed because "ci/lib.sh" would set up various environment variables for us, but now we can instead use the "ci/lib.sh" in its script mode. The "mkdir -p" added in b819f1d (ci: parallelize testing on Windows, 2019-01-29) isn't needed, the same commit added that "mkdir -p" to the "artifacts-tar" rule itself, so we can have "make" create the directory for us. This also has the benefit of making the "build" step less chatty, since it won't start with the verbose "set -x" output, that's now contained in the "ci/lib.sh" step. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 7fd4732 commit 12a1513

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,15 @@ jobs:
8787
steps:
8888
- uses: actions/checkout@v2
8989
- uses: git-for-windows/setup-git-for-windows-sdk@v1
90+
- run: ci/lib.sh
91+
shell: bash
9092
- name: build
9193
shell: bash
9294
env:
9395
HOME: ${{runner.workspace}}
9496
NO_PERL: 1
95-
run: . /etc/profile && ci/make-test-artifacts.sh artifacts
97+
run: . /etc/profile && make artifacts-tar ARTIFACTS_DIRECTORY=artifacts
98+
if: success()
9699
- run: ci/check-unignored-build-artifacts.sh
97100
if: success()
98101
shell: bash

ci/make-test-artifacts.sh

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)