Skip to content

Commit e69b46b

Browse files
committed
Cut down work for quick t5580 bisecting
1 parent 478f304 commit e69b46b

File tree

3 files changed

+3
-118
lines changed

3 files changed

+3
-118
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -59,49 +59,6 @@ jobs:
5959
- name: Cygport test
6060
run: cygport git.cygport test
6161
timeout-minutes: 300
62-
- name: Cygport install
63-
run: cygport git.cygport install
64-
timeout-minutes: 30
65-
- name: Cygport package
66-
run: cygport git.cygport package
67-
timeout-minutes: 5
68-
- name: Configure SSH
69-
if: github.ref == 'refs/heads/main'
70-
env:
71-
MAINTAINER_KEY: ${{ secrets.MAINTAINER_KEY }}
72-
run: |
73-
umask 0077
74-
mkdir -p ~/.ssh
75-
echo "$MAINTAINER_KEY" >~/.ssh/id_rsa
76-
echo 'cygwin.com,8.43.85.97 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGqrxexIuyqmCVe33p1HuhUFzsXte5QZKb+BJlsRrvXOpUOJEW2S0kszyAiymeV7AXaYmHDKVRJpGVR+0ua0Xww=' >~/.ssh/known_hosts
77-
timeout-minutes: 1
78-
- name: Create release tag
79-
if: github.ref == 'refs/heads/main'
80-
env:
81-
GIT_COMMITTER_NAME: ${{ github.actor }}
82-
GIT_COMMITTER_EMAIL: ${{ github.actor }}@users.noreply.github.com
83-
run: |
84-
git tag -am "v${PVR}" "v${PVR}"
85-
git push origin tag "v${PVR}"
86-
timeout-minutes: 1
87-
- name: Create a GitHub release
88-
if: github.ref == 'refs/heads/main'
89-
uses: softprops/action-gh-release@v1
90-
with:
91-
tag_name: v${{ env.PVR }}
92-
files: |
93-
git-*/dist/git/*
94-
git-*/dist/git/*/*
95-
target_commitish: ${{ github.ref }}
96-
timeout-minutes: 2
97-
- name: Mirror to Cygwin Git repositories
98-
if: github.ref == 'refs/heads/main'
99-
run: git push [email protected]:/git/cygwin-packages/git tag "v${PVR}"
100-
timeout-minutes: 5
101-
- name: Cygport upload
102-
if: github.ref == 'refs/heads/main'
103-
run: SSH_KEY=~/.ssh/id_rsa cygport git.cygport upload
104-
timeout-minutes: 5
10562
- name: Tar up build results
10663
if: always()
10764
run: tar -caf git-build-results.txz git-*-*.*/

build-requires.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ bash-completion
33
bash-completion-devel
44
cygport
55
dblatex
6-
docbook-xml45
7-
docbook2X
86
gcc-core
97
gettext
108
gettext-devel
@@ -27,9 +25,5 @@ perl-XML-SAX
2725
perl-YAML
2826
pkg-config
2927
subversion-perl
30-
texlive-collection-fontsrecommended
31-
texlive-collection-latexrecommended
32-
texlive-collection-pictures
3328
time
34-
xmlto
3529
zlib-devel

git.cygport

Lines changed: 3 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -91,81 +91,15 @@ src_compile() {
9191
lndirs
9292
cd ${B}
9393
cygconf --with-libpcre
94-
cygmake all html man info pdf
94+
cygmake all
9595
}
9696

9797
src_install() {
98-
cd ${B}
99-
cyginstall install-html install-man install-info install-pdf pdfdir=/usr/share/doc/git
100-
101-
# Ship bash completion
102-
insinto "$(pkg-config --variable=completionsdir bash-completion)"
103-
newins ${S}/contrib/completion/git-completion.bash git
98+
exit 1
10499
}
105100

106101
src_test() {
107-
# Test t4018 fails if the files in the build directory are left as
108-
# symlinks rather than being real files.
109-
rm ${B}/t/t4018/*
110-
cp ${S}/t/t4018/* ${B}/t/t4018
111-
cd ${B}
112-
113-
# Unless GIT_SKIP_TESTS is already set, in which case trust the version
114-
# that comes from the environment (including if it's the null string),
115-
# always skip known failures.
116-
if [[ ! -v GIT_SKIP_TESTS ]]; then
117-
known_failures=()
118-
119-
# https://github.com/me-and/Cygwin-Git/issues/54
120-
known_failures+=(t5562)
121-
122-
export GIT_SKIP_TESTS="${known_failures[*]}"
123-
fi
124-
125-
# Also pull in skips set in GIT_SKIP_ADDITIONAL_TESTS. That's an
126-
# environment variable made up for this script rather than one
127-
# suggested by the Git build infrastructure. The idea is that setting
128-
# GIT_SKIP_TESTS would override the previous block for skipping known
129-
# failures, GIT_SKIP_ADDITIONAL_TESTS will be an addition to the
130-
# previous block.
131-
[[ -v GIT_SKIP_ADDITIONAL_TESTS ]] && export GIT_SKIP_TESTS="${GIT_SKIP_TESTS}${GIT_SKIP_TESTS:+ }${GIT_SKIP_ADDITIONAL_TESTS}"
132-
133-
# Create an array of tests to skip for the main run, but which
134-
# shouldn't be listed in the GIT_SKIP_TESTS environment variable,
135-
# because we may want to try to run them later.
136-
main_run_skip_tests=()
137-
138-
# Skip t0021, since it seems to hang when run through prove in GitHub
139-
# Actions. Run it later, outside prove, where it doesn't have that
140-
# problem.
141-
# https://github.com/me-and/Cygwin-Git/issues/53
142-
main_run_skip_tests+=('t0021')
143-
144-
# Skip t7900 from the main run as it needs a lot of disk space. If
145-
# there's sufficient space later, we can run it then.
146-
main_run_skip_tests+=('t7900')
147-
148-
# Return code. Set to zero now, it'll be set to non-zero by any test
149-
# that fails. We want to know about all failures, but we also want to
150-
# run later tests even if earlier ones fail.
151-
rc=0
152-
153-
GIT_SKIP_TESTS="${GIT_SKIP_TESTS}${GIT_SKIP_TESTS:+ }${main_run_skip_tests[*]}" GIT_TEST_OPTS='--tee -l' DEFAULT_TEST_TARGET=prove GIT_PROVE_OPTS="--jobs $(($(nproc 2>/dev/null) + 1)) --timer" cygtest || rc=$?
154-
155-
# Run t0021 since it was skipped earlier.
156-
( cd ${B}/t && echo t0021-*.sh && ./t0021-*.sh --tee -l; ) || rc="$?"
157-
158-
# Run t7900 if there's at least 10GB free disk space. It's much more
159-
# likely that that's the case now other tests aren't running at the
160-
# same time.
161-
if (( $(($(stat -f --format="%a*%S" .) / 1024 / 1024 / 1024)) > 10 )); then
162-
( cd ${B}/t && echo t7900-*.sh && ./t7900-*.sh --tee -l; ) || rc="$?"
163-
else
164-
echo 'Skipping t7900 due to lack of disk space'
165-
rc=1
166-
fi
167-
168-
return "$rc"
102+
( cd ${B}/t && echo t5580-*.sh && ./t5580-*.sh --tee --verbose -l; )
169103
}
170104

171105
# vim: set noexpandtab tabstop=8 listchars=tab\:\ \ ,trail\:-,lead\:-

0 commit comments

Comments
 (0)