Skip to content

Fix the Azure Pipeline (e.g. macOS builds after the upgrade to Mojave) #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kewillford merged 21 commits into from
May 11, 2019
Merged

Fix the Azure Pipeline (e.g. macOS builds after the upgrade to Mojave) #137

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3f360de
git-p4: remove ticket expiry test
luked99 Feb 6, 2019
37c8001
fetch: avoid calling write_or_die()
peff Mar 5, 2019
1435889
fetch: ignore SIGPIPE during network operation
peff Mar 3, 2019
4be16db
macOS: make sure that gettext is found
dscho Apr 14, 2019
6a2dc80
t9822: skip tests if file names cannot be ISO-8859-1 encoded
dscho Apr 14, 2019
00f1927
Merge branch 'js/macos-gettext-build'
dscho Apr 24, 2019
1fa66cd
Merge branch 'js/iso8895-test-on-apfs'
dscho Apr 24, 2019
7671a38
mingw: allow building with an MSYS2 runtime v3.x
dscho Mar 8, 2019
357204f
Merge branch 'jk/no-sigpipe-during-network-transport'
dscho May 3, 2019
0d14af1
Merge branch 'ld/git-p4-remove-flakey-test'
dscho May 4, 2019
469f915
t6500(mingw): use the Windows PID of the shell
dscho May 4, 2019
de859a7
ci: use git-sdk-64-minimal
dscho May 4, 2019
b149316
ci: use newer Azure Pipelines YAML schema
dscho May 10, 2019
9d2b561
ci: backport parallel tests on Windows
dscho May 10, 2019
32f719b
fixup! mingw: special-case arguments to `sh`
dscho Dec 27, 2018
d68d6c8
ci: move the Windows jobs to the top
dscho May 10, 2019
91802d2
compat/obstack: fix -Wcast-function-type warnings
szeder Jan 17, 2019
7df0cdf
mingw: allow compiling with GCC 8 and DEVELOPER=1
dscho Mar 29, 2019
2f0b391
kwset: allow building with GCC 8
dscho Mar 29, 2019
32c18f9
fixup! mingw: kill child processes in a gentler way
dscho Apr 3, 2019
5239829
Merge branch 'dscho/gcc-8-gfw'
dscho Apr 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions builtin/fetch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1588,7 +1588,9 @@ static int fetch_one(struct remote *remote, int argc, const char **argv, int pru

sigchain_push_common(unlock_pack_on_signal);
atexit(unlock_pack);
sigchain_push(SIGPIPE, SIG_IGN);
exit_code = do_fetch(gtransport, &rs);
sigchain_pop(SIGPIPE);
refspec_clear(&rs);
transport_disconnect(gtransport);
gtransport = NULL;
Expand Down
4 changes: 3 additions & 1 deletion config.mak.uname
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,8 @@ ifeq ($(uname_S),Darwin)
HAVE_BSD_SYSCTL = YesPlease
FREAD_READS_DIRECTORIES = UnfortunatelyYes
HAVE_NS_GET_EXECUTABLE_PATH = YesPlease
BASIC_CFLAGS += -I/usr/local/include
BASIC_LDFLAGS += -L/usr/local/lib
endif
ifeq ($(uname_S),SunOS)
NEEDS_SOCKET = YesPlease
Expand Down Expand Up @@ -608,7 +610,7 @@ ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
NO_GETTEXT = YesPlease
COMPAT_CLFAGS += -D__USE_MINGW_ACCESS
else
ifeq ($(shell expr "$(uname_R)" : '2\.'),2)
ifneq ($(shell expr "$(uname_R)" : '1\.'),2)
# MSys2
prefix = /usr/
# Enable DEP
Expand Down
9 changes: 6 additions & 3 deletions fetch-pack.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,10 @@ static void send_request(struct fetch_pack_args *args,
if (args->stateless_rpc) {
send_sideband(fd, -1, buf->buf, buf->len, LARGE_PACKET_MAX);
packet_flush(fd);
} else
write_or_die(fd, buf->buf, buf->len);
} else {
if (write_in_full(fd, buf->buf, buf->len) < 0)
die_errno(_("unable to write to remote"));
}
}

static void insert_one_alternate_object(struct fetch_negotiator *negotiator,
Expand Down Expand Up @@ -1181,7 +1183,8 @@ static int send_fetch_request(struct fetch_negotiator *negotiator, int fd_out,

/* Send request */
packet_buf_flush(&req_buf);
write_or_die(fd_out, req_buf.buf, req_buf.len);
if (write_in_full(fd_out, req_buf.buf, req_buf.len) < 0)
die_errno(_("unable to write request to remote"));

strbuf_release(&req_buf);
return ret;
Expand Down
6 changes: 4 additions & 2 deletions pkt-line.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,15 @@ static void packet_trace(const char *buf, unsigned int len, int write)
void packet_flush(int fd)
{
packet_trace("0000", 4, 1);
write_or_die(fd, "0000", 4);
if (write_in_full(fd, "0000", 4) < 0)
die_errno(_("unable to write flush packet"));
}

void packet_delim(int fd)
{
packet_trace("0001", 4, 1);
write_or_die(fd, "0001", 4);
if (write_in_full(fd, "0001", 4) < 0)
die_errno(_("unable to write delim packet"));
}

int packet_flush_gently(int fd)
Expand Down
7 changes: 7 additions & 0 deletions t/t9822-git-p4-path-encoding.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ test_description='Clone repositories with non ASCII paths'
UTF8_ESCAPED="a-\303\244_o-\303\266_u-\303\274.txt"
ISO8859_ESCAPED="a-\344_o-\366_u-\374.txt"

ISO8859="$(printf "$ISO8859_ESCAPED")" &&
echo content123 >"$ISO8859" &&
rm "$ISO8859" || {
skip_all="fs does not accept ISO-8859-1 filenames"
test_done
}

test_expect_success 'start p4d' '
start_p4d
'
Expand Down