{"thread":{"id":"57786","subject":"[PATCH] fixup! CI: use https, not http to download binaries from perforce.com","startedAt":"2022-04-23T15:45:34Z","lastAt":"2022-04-23T17:34:15Z","messageCount":3,"participants":["Carlo Marcelo Arenas Belón","Junio C Hamano","Carlo Arenas"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"454339","messageId":"20220423154420.32885-1-carenas@gmail.com","threadId":"57786","inReplyTo":"0220423142559.32507-5-carenas@gmail.com","subject":"[PATCH] fixup! CI: use https, not http to download binaries from perforce.com","fromName":"Carlo Marcelo Arenas Belón","fromEmail":"carenas@gmail.com","sentAt":"2022-04-23T15:44:20Z","receivedAt":"2022-04-23T15:45:34Z","isPatch":true,"sender":{"key":"carenas@gmail.com","avatar":"https://avatars.githubusercontent.com/u/76036?v=4"},"body":"Not sure why this is suddently faiing, but this proposed fixup also\nmakes both server names consistent and would be easier to clean up\nlater.\n\nSigned-off-by: Carlo Marcelo Arenas Belón \n---\n ci/install-dependencies.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh\nindex 98444821729..b8ace0355e2 100755\n--- a/ci/install-dependencies.sh\n+++ b/ci/install-dependencies.sh\n@@ -5,7 +5,7 @@\n \n . ${0%/*}/lib.sh\n \n-P4WHENCE=https://filehost.perforce.com/perforce/r$LINUX_P4_VERSION\n+P4WHENCE=https://cdist2.perforce.com/perforce/r$LINUX_P4_VERSION\n LFSWHENCE=https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION\n UBUNTU_COMMON_PKGS=\"make libssl-dev libcurl4-openssl-dev libexpat-dev\n tcl tk gettext zlib1g-dev perl-modules liberror-perl libauthen-sasl-perl\n-- \n2.36.0.266.g59f845bde02\n\n"},{"id":"454344","messageId":"xmqq8rrv3hcw.fsf@gitster.g","threadId":"57786","inReplyTo":"20220423154420.32885-1-carenas@gmail.com","subject":"Re: [PATCH] fixup! CI: use https, not http to download binaries from perforce.com","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-04-23T16:16:31Z","receivedAt":"2022-04-23T17:12:57Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Carlo Marcelo Arenas Belón writes:\n\n> Not sure why this is suddently faiing, but this proposed fixup also\n> makes both server names consistent and would be easier to clean up\n> later.\n\nYeah, I was wondering why the other one uses a fully hardcoded URL\nthat these variables do not know about.\n\nWould it make sense to rename LINUX_P4_VERSION to P4_AT_PERFORCE_VERSION\nor something and set it also in the macOS section in ci/lib.sh? We have\n\n\t# The Linux build installs the defined dependency versions below.\n\t# The OS X build installs much more recent versions, whichever\n\t# were recorded in the Homebrew database upon creating the OS X\n\t# image.\n\t# Keep that in mind when you encounter a broken OS X build!\n\texport LINUX_P4_VERSION=\"16.2\"\n\nwhich if I am reading your series correctly has become stale; we no\nlonger rely on brew/cask, and do this for macOS identically to what\nwe do here for Linux.\n\n\n> Signed-off-by: Carlo Marcelo Arenas Belón \n> ---\n> ci/install-dependencies.sh | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh\n> index 98444821729..b8ace0355e2 100755\n> --- a/ci/install-dependencies.sh\n> +++ b/ci/install-dependencies.sh\n> @@ -5,7 +5,7 @@\n> \n> . ${0%/*}/lib.sh\n> \n> -P4WHENCE=https://filehost.perforce.com/perforce/r$LINUX_P4_VERSION\n> +P4WHENCE=https://cdist2.perforce.com/perforce/r$LINUX_P4_VERSION\n> LFSWHENCE=https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION\n> UBUNTU_COMMON_PKGS=\"make libssl-dev libcurl4-openssl-dev libexpat-dev\n> tcl tk gettext zlib1g-dev perl-modules liberror-perl libauthen-sasl-perl\n"},{"id":"454345","messageId":"CAPUEsphvWke=09W_Bk2Hj+aaTbocjdtbPr99t7tXoutodO0cVw@mail.gmail.com","threadId":"57786","inReplyTo":"xmqq8rrv3hcw.fsf@gitster.g","subject":"Re: [PATCH] fixup! CI: use https, not http to download binaries from perforce.com","fromName":"Carlo Arenas","fromEmail":"carenas@gmail.com","sentAt":"2022-04-23T17:33:59Z","receivedAt":"2022-04-23T17:34:15Z","isPatch":true,"sender":{"key":"carenas@gmail.com","avatar":"https://avatars.githubusercontent.com/u/76036?v=4"},"body":"On Sat, Apr 23, 2022 at 10:12 AM Junio C Hamano wrote:\n> Carlo Marcelo Arenas Belón writes:\n>\n> > Not sure why this is suddenly failing, but this proposed fixup also\n> > makes both server names consistent and would be easier to clean up\n> > later.\n\nI think my merge resolution was wrong and so it might not be as\nobvious as I thought.\n\n> Yeah, I was wondering why the other one uses a fully hardcoded URL\n> that these variables do not know about.\n>\n> Would it make sense to rename LINUX_P4_VERSION to P4_AT_PERFORCE_VERSION\n> or something and set it also in the macOS section in ci/lib.sh?\n\nWill do (if I can just find which of the sometimes conflicting changes\nin the later branches would be the best target),\nbut I was preparing a fixup or commit to a different series instead of\none for this one.\n\n> We have\n>\n> # The Linux build installs the defined dependency versions below.\n> # The OS X build installs much more recent versions, whichever\n> # were recorded in the Homebrew database upon creating the OS X\n> # image.\n> # Keep that in mind when you encounter a broken OS X build!\n> export LINUX_P4_VERSION=\"16.2\"\n>\n> which if I am reading your series correctly has become stale; we no\n> longer rely on brew/cask, and do this for macOS identically to what\n> we do here for Linux.\n\ncorrect; this comment is the one I punted fixing to avoid conflicts\nand that I refer to in my commit.\nI suspect that some of the moving around that was done in later code\ncould be avoided now that both jobs use wget to get perforce, but\nregardless moving that comment into the linux branch wasn't correct\n(we can't assume then what the other branch does) so at minimum it\nshould look like :\n\n # The Linux build installs the defined dependency versions below.\n # The OS X build installs much more recent versions\n # Keep that in mind when you encounter a broken OS X build!\n\nCarlo\n"}]}