Skip to content

Commit d665063

Browse files
dschodscho
authored
Merge pull request #98 from git-for-windows/test-callable-workflow
CI: make and call reusable workflow for running tests
2 parents d392ec5 + 75b8480 commit d665063

File tree

2 files changed

+133
-99
lines changed

2 files changed

+133
-99
lines changed

‎.github/workflows/ci-artifacts.yml‎

Lines changed: 17 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ jobs:
1717
minimal-sdk-artifact:
1818
if: github.event.repository.fork == false
1919
runs-on: windows-latest
20+
outputs:
21+
git-artifacts-extract-location: ${{ steps.git-artifacts-extract-location.outputs.result }}
2022
steps:
2123
- name: clone git-sdk-64
2224
run: |
@@ -59,6 +61,12 @@ jobs:
5961
with:
6062
name: git-artifacts
6163
path: git-artifacts.tar.gz
64+
- name: determine where `git-artifacts` want to be extracted
65+
id: git-artifacts-extract-location
66+
shell: bash
67+
run: |
68+
cd .. &&
69+
echo "result=$(pwd)" >>$GITHUB_OUTPUT
6270
- name: create zip and 7z SFX variants of the minimal SDK
6371
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
6472
shell: bash
@@ -77,109 +85,19 @@ jobs:
7785
with:
7886
name: minimal-sdk-extra
7987
path: minimal-sdk-extra
80-
test-minimal-sdk:
81-
runs-on: windows-latest
82-
needs: [minimal-sdk-artifact]
83-
strategy:
84-
matrix:
85-
# 0..16 permuted according to the matrix builds' timings as of git/git@9fadedd63
86-
nr: [9, 6, 13, 0, 8, 5, 2, 16, 15, 11, 10, 1, 7, 3, 14, 12, 4]
87-
steps:
88-
- name: download minimal-sdk artifact
89-
uses: actions/download-artifact@v4
90-
with:
91-
name: minimal-sdk
92-
path: ${{github.workspace}}
93-
- name: uncompress minimal-sdk
94-
shell: bash
95-
run: |
96-
mkdir -p minimal-sdk &&
97-
tar -C minimal-sdk -xzf git-sdk-x86_64-minimal.tar.gz &&
98-
cygpath -aw minimal-sdk/usr/bin >>$GITHUB_PATH
99-
- name: download git artifacts
100-
uses: actions/download-artifact@v4
101-
with:
102-
name: git-artifacts
103-
path: ${{github.workspace}}
104-
- name: uncompress git-artifacts
105-
shell: bash
106-
run: tar -C .. -xzf git-artifacts.tar.gz
107-
- name: test
108-
shell: bash
109-
run: |
110-
set -x
111-
. /etc/profile
112-
test "$(cygpath -aw /)" = "${{github.workspace}}\minimal-sdk" || exit 1
113-
cd ../git/t &&
114-
make T="$(ls -S t[0-9]*.sh | awk '!((NR+${{matrix.nr}})%17)' | tr '\n' \ )" prove || {
115-
for d in trash*
116-
do
117-
t=${d#trash directory.}
118-
echo ===========================
119-
echo Failed: $t.sh
120-
cat test-results/$t.out
121-
done
122-
exit 1
123-
}
124-
env:
125-
GIT_TEST_OPTS: --verbose-log -x --no-chain-lint
126-
GIT_PROVE_OPTS: --timer --jobs 8
127-
NO_SVN_TESTS: 1
128-
assorted-validations:
129-
runs-on: windows-latest
130-
needs: [minimal-sdk-artifact]
131-
steps:
132-
- name: download minimal-sdk artifact
133-
uses: actions/download-artifact@v4
134-
with:
135-
name: minimal-sdk
136-
path: ${{github.workspace}}
137-
- name: uncompress minimal-sdk
138-
shell: bash
139-
run: |
140-
mkdir -p minimal-sdk &&
141-
tar -C minimal-sdk -xzf git-sdk-x86_64-minimal.tar.gz &&
142-
cygpath -aw minimal-sdk/usr/bin >>$GITHUB_PATH
143-
- name: run some tests
144-
shell: bash
145-
run: |
146-
set -x
147-
. /etc/profile
148-
149-
# cygpath works
150-
test "$(cygpath -aw /)" = "${{github.workspace}}\minimal-sdk" || exit 1
151-
152-
# comes with GCC and can compile a DLL
153-
test "$(type -p gcc)" = "/mingw64/bin/gcc" || exit 1
154-
cat >dll.c <<-\EOF &&
155-
__attribute__((dllexport)) int increment(int i)
156-
{
157-
return i + 1;
158-
}
159-
EOF
16088

161-
gcc -Wall -g -O2 -shared -o sample.dll dll.c || exit 1
162-
ls -la
163-
164-
# stat works
165-
test "stat is /usr/bin/stat" = "$(type stat)" || exit 1
166-
stat /usr/bin/stat.exe || exit 1
89+
test-minimal-sdk:
90+
needs: minimal-sdk-artifact
91+
uses: ./.github/workflows/test-ci-artifacts.yml
92+
with:
93+
git-artifacts-extract-location: ${{ needs.minimal-sdk-artifact.outputs.git-artifacts-extract-location }}
94+
permissions:
95+
contents: read
16796

168-
# unzip works
169-
test "unzip is /usr/bin/unzip" = "$(type unzip)" || exit 1
170-
git init unzip-test &&
171-
echo TEST >unzip-test/README &&
172-
git -C unzip-test add -A &&
173-
git -C unzip-test -c user.name=A -c [email protected] commit -m 'Testing, testing...' &&
174-
git --git-dir=unzip-test/.git archive -o test.zip HEAD &&
175-
unzip -v test.zip >unzip-test.out &&
176-
cat unzip-test.out &&
177-
test "grep is /usr/bin/grep" = "$(type grep)" || exit 1
178-
grep README unzip-test.out
17997
publish-release-assets:
18098
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
18199
runs-on: ubuntu-latest
182-
needs: [test-minimal-sdk, assorted-validations]
100+
needs: test-minimal-sdk
183101
steps:
184102
- name: download minimal-sdk artifact
185103
uses: actions/download-artifact@v4
@@ -263,4 +181,4 @@ jobs:
263181
...req,
264182
ref: 'tags/ci-artifacts',
265183
sha: process.env.GITHUB_SHA,
266-
})
184+
})

‎.github/workflows/test-ci-artifacts.yml‎

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
name: test-ci-artifacts
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
git-artifacts-extract-location:
7+
required: true
8+
type: string
9+
10+
env:
11+
LC_CTYPE: C.UTF-8
12+
13+
jobs:
14+
test-minimal-sdk:
15+
runs-on: windows-latest
16+
strategy:
17+
matrix:
18+
# 0..16 permuted according to the matrix builds' timings as of git/git@9fadedd63
19+
nr: [9, 6, 13, 0, 8, 5, 2, 16, 15, 11, 10, 1, 7, 3, 14, 12, 4]
20+
steps:
21+
- name: download minimal-sdk artifact
22+
uses: actions/download-artifact@v4
23+
with:
24+
name: minimal-sdk
25+
path: ${{github.workspace}}
26+
- name: uncompress minimal-sdk
27+
shell: bash
28+
run: |
29+
mkdir -p minimal-sdk &&
30+
tar -C minimal-sdk -xzf git-sdk-x86_64-minimal.tar.gz &&
31+
cygpath -aw minimal-sdk/usr/bin >>$GITHUB_PATH
32+
- name: download git artifacts
33+
uses: actions/download-artifact@v4
34+
with:
35+
name: git-artifacts
36+
path: ${{github.workspace}}
37+
- name: uncompress git-artifacts
38+
shell: bash
39+
env:
40+
GIT_ARTIFACTS_EXTRACT_LOCATION: ${{ inputs.git-artifacts-extract-location }}
41+
run: |
42+
mkdir -p "$GIT_ARTIFACTS_EXTRACT_LOCATION" &&
43+
tar -C "$GIT_ARTIFACTS_EXTRACT_LOCATION" -xzf git-artifacts.tar.gz
44+
- name: test
45+
shell: bash
46+
run: |
47+
set -x
48+
. /etc/profile
49+
test "$(cygpath -aw /)" = "${{github.workspace}}\minimal-sdk" || exit 1
50+
cd "$GIT_ARTIFACTS_EXTRACT_LOCATION"/git/t &&
51+
make T="$(ls -S t[0-9]*.sh | awk '!((NR+${{matrix.nr}})%17)' | tr '\n' \ )" prove || {
52+
for d in trash*
53+
do
54+
t=${d#trash directory.}
55+
echo ===========================
56+
echo Failed: $t.sh
57+
cat test-results/$t.out
58+
done
59+
exit 1
60+
}
61+
env:
62+
GIT_ARTIFACTS_EXTRACT_LOCATION: ${{ inputs.git-artifacts-extract-location }}
63+
GIT_TEST_OPTS: --verbose-log -x --no-chain-lint
64+
GIT_PROVE_OPTS: --timer --jobs 8
65+
NO_SVN_TESTS: 1
66+
assorted-validations:
67+
runs-on: windows-latest
68+
steps:
69+
- name: download minimal-sdk artifact
70+
uses: actions/download-artifact@v4
71+
with:
72+
name: minimal-sdk
73+
path: ${{github.workspace}}
74+
- name: uncompress minimal-sdk
75+
shell: bash
76+
run: |
77+
mkdir -p minimal-sdk &&
78+
tar -C minimal-sdk -xzf git-sdk-x86_64-minimal.tar.gz &&
79+
cygpath -aw minimal-sdk/usr/bin >>$GITHUB_PATH
80+
- name: run some tests
81+
shell: bash
82+
run: |
83+
set -x
84+
. /etc/profile
85+
86+
# cygpath works
87+
test "$(cygpath -aw /)" = "${{github.workspace}}\minimal-sdk" || exit 1
88+
89+
# comes with GCC and can compile a DLL
90+
test "$(type -p gcc)" = "/mingw64/bin/gcc" || exit 1
91+
cat >dll.c <<-\EOF &&
92+
__attribute__((dllexport)) int increment(int i)
93+
{
94+
return i + 1;
95+
}
96+
EOF
97+
98+
gcc -Wall -g -O2 -shared -o sample.dll dll.c || exit 1
99+
ls -la
100+
101+
# stat works
102+
test "stat is /usr/bin/stat" = "$(type stat)" || exit 1
103+
stat /usr/bin/stat.exe || exit 1
104+
105+
# unzip works
106+
test "unzip is /usr/bin/unzip" = "$(type unzip)" || exit 1
107+
git init unzip-test &&
108+
echo TEST >unzip-test/README &&
109+
git -C unzip-test add -A &&
110+
git -C unzip-test -c user.name=A -c [email protected] commit -m 'Testing, testing...' &&
111+
git --git-dir=unzip-test/.git archive -o test.zip HEAD &&
112+
unzip -v test.zip >unzip-test.out &&
113+
cat unzip-test.out &&
114+
test "grep is /usr/bin/grep" = "$(type grep)" || exit 1
115+
grep README unzip-test.out
116+

0 commit comments

Comments
 (0)