From patchwork Sat Apr 23 14:25:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Carlo_Marcelo_Arenas_Bel=C3=B3n?= X-Patchwork-Id: 12824577 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D403C433F5 for ; Sat, 23 Apr 2022 14:26:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232063AbiDWO3f (ORCPT ); Sat, 23 Apr 2022 10:29:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236234AbiDWO3S (ORCPT ); Sat, 23 Apr 2022 10:29:18 -0400 Received: from mail-oi1-x234.google.com (mail-oi1-x234.google.com [IPv6:2607:f8b0:4864:20::234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1AAD9101DB for ; Sat, 23 Apr 2022 07:26:20 -0700 (PDT) Received: by mail-oi1-x234.google.com with SMTP id 12so12150631oix.12 for ; Sat, 23 Apr 2022 07:26:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=w0wj2xoZBMsvO/Xau1e9Rw1SFEQUkRzX4CsF/i9Xvkw=; b=nrn8AFaRUjf3sXu5nhV1DSyOLz/ll9bRKYTCnFrwnrAHZxqAlBD8DFdUUDwJauUOjr R0hNNuIHWvTK3x3PPxksTULKxpLz8Y0+BFMg7jLCbHZGO5gpC+VLlGu5J3aOVTsgzALo pkaxN9hCOHE9iDXZjFONKhMPFZWBNKzqfDA+o17m/QWyFA5lHgpZQZ8Y5AXpzMCgzrfW ZCqfI/mgHl1KWXiI2pSbvGM67OeUxK0r/qE0k40nruJ1/PUhkExzFVzNgzyVoBfw7qDY aeq3p4zc3lE/tfxI8Ht3J6sRzYnfsbjZSjyLiUDN7lt5Wda1cOUviT4l2KG2XhFSHBCC uvYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=w0wj2xoZBMsvO/Xau1e9Rw1SFEQUkRzX4CsF/i9Xvkw=; b=5VeKhUn2RgxeB8r0qfCUv66IsHTAqS2rgJ6ctIEBepcYRXcl+lvE4xkDYb9Ukim0KC EjZqZvK2iaoXHJZESjPLEf5x9PAbOGcvwF0g4/HLEG5LKMscGQcTaOBFUHlQ7KyXw0nO p1fR+Gi+cLNIldCA7sMwRFK8xZeN06PNMfv0QkY1X19fivb/0t+Heg8nAc7MHdSyj5uz RZynWP3erQkYqol2agpt7JqT8Dd99bOA7BoVsk0bg3YRsk7a6w4NYPUOD8Oxp/feAyP4 l1sHD1PbPtEJfakt17U+hJqRtTZp7j9tPu+usuBT4/q3X3x5L08AARF3N04q8RNlbdOa K8Sw== X-Gm-Message-State: AOAM532DIh40HrpQPQ/M6SKHAbdMRmQ3BdwpvGOwNb9almCRpdlRonYN eph3KvM1g5XKWxTxTZSYmHoDNxfY4zg= X-Google-Smtp-Source: ABdhPJyZnA5LdH/EvXX3/owaKSNNqqln58OSj35Xc6lCmR5hH2mC5kx2oKj7+kiBj+Fe3IBKYT2axQ== X-Received: by 2002:aca:654a:0:b0:323:1b2c:f419 with SMTP id j10-20020aca654a000000b003231b2cf419mr4673812oiw.235.1650723979318; Sat, 23 Apr 2022 07:26:19 -0700 (PDT) Received: from carlos-mbp.lan (104-1-92-200.lightspeed.sntcca.sbcglobal.net. [104.1.92.200]) by smtp.gmail.com with ESMTPSA id s4-20020a0568301e0400b006015bafee43sm1869993otr.46.2022.04.23.07.26.18 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Apr 2022 07:26:18 -0700 (PDT) From: =?utf-8?q?Carlo_Marcelo_Arenas_Bel=C3=B3n?= To: git@vger.kernel.org Cc: gitster@pobox.com, avarab@gmail.com, sunshine@sunshineco.com, Johannes.Schindelin@gmx.de, =?utf-8?q?Carlo_Marcelo_Arenas_Bel=C3=B3n?= Subject: [PATCH v3 1/4] ci: make failure to find perforce more user friendly Date: Sat, 23 Apr 2022 07:25:56 -0700 Message-Id: <20220423142559.32507-2-carenas@gmail.com> X-Mailer: git-send-email 2.36.0.266.g59f845bde02 In-Reply-To: <20220423142559.32507-1-carenas@gmail.com> References: <20220422013911.7646-1-carenas@gmail.com> <20220423142559.32507-1-carenas@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org In preparation for a future change that will make perforce installation optional in macOS, make sure that the check for it is done without triggering scary looking errors and add a user friendly message instead. All other existing uses of 'type ' in our shell scripts that check the availability of a command send both standard output and error stream to /dev/null to squelch " not found" diagnostic output, but this script left the standard error stream shown. Redirect it just like everybody else to squelch this error message that we fully expect to see. Helped-by: Eric Sunshine Signed-off-by: Carlo Marcelo Arenas Belón --- ci/install-dependencies.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index dbcebad2fb2..41e9290fbdd 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -78,15 +78,19 @@ linux-gcc-default) ;; esac -if type p4d >/dev/null && type p4 >/dev/null +if type p4d >/dev/null 2>&1 && type p4 >/dev/null 2>&1 then echo "$(tput setaf 6)Perforce Server Version$(tput sgr0)" p4d -V | grep Rev. echo "$(tput setaf 6)Perforce Client Version$(tput sgr0)" p4 -V | grep Rev. +else + echo "WARNING: perforce wasn't installed, see above for clues why" >2 fi -if type git-lfs >/dev/null +if type git-lfs >/dev/null 2>&1 then echo "$(tput setaf 6)Git-LFS Version$(tput sgr0)" git-lfs version +else + echo "WARNING: git-lfs wasn't installed, see above for clues why" >2 fi From patchwork Sat Apr 23 14:25:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Carlo_Marcelo_Arenas_Bel=C3=B3n?= X-Patchwork-Id: 12824580 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0C2EDC433F5 for ; Sat, 23 Apr 2022 14:27:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232027AbiDWOaf (ORCPT ); Sat, 23 Apr 2022 10:30:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236237AbiDWO3U (ORCPT ); Sat, 23 Apr 2022 10:29:20 -0400 Received: from mail-ot1-x329.google.com (mail-ot1-x329.google.com [IPv6:2607:f8b0:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3033EC8 for ; Sat, 23 Apr 2022 07:26:21 -0700 (PDT) Received: by mail-ot1-x329.google.com with SMTP id i11-20020a9d4a8b000000b005cda3b9754aso7499412otf.12 for ; Sat, 23 Apr 2022 07:26:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jJfeCFNmMlewxZOpySspiG6Y1Syj1HVfkWGU5rRdLm0=; b=Bu8T0hNyWGid5zHiukrIKIKxIjUIKS1/Wuc5dnrUuV3WIJ3azlsnbZwke1CGP7zq0o I7tG2IssbjsOxjOvN2x+4Bj8smGvN/JZOWIw5KOQntz0mVJ2zv1Pa1wjUiID+Bj4j867 aYm7At7iKWVvcq7lM5FUXUDLR03j3VCKA1j+PpplQA04Zv2ng+YP1LT48qpxgsrNIR76 KnKaKFI2AqAFow5z0i5K6/dH1lMBsLC4XUaG5XxWfin9nQTraRD6Uk6xYGm4wmJffN4/ AJ6eFs0E3ezBTgVu/P7YTuZQgE4WCxespE24rZB6C05E8Cu5Z1UBmUCyrxBPtHkdETOp r0uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jJfeCFNmMlewxZOpySspiG6Y1Syj1HVfkWGU5rRdLm0=; b=dlAvk1pVP/SEOfu6k7Scl+Ee6oL7CxD146xe3y+HBUi+0ruEmF7p1BozarkTNx2dmP ELAJiHBCA/yZIT5euMCCG0ElxWKd0k/wQGldqatr0WYETJcCFTHuYHCSo44u0Zamdque HJK9AhVUhg2JgD81qyOWh+JarcS1mlH9vWJi1Rrfy4F45lchzihoK6Zn/hdAXiSIXLSg ECQ/akEKvNygy4DU/DYHCIB3GkHS96zXr1M2GEntkbrfXP3GQSlFFVmWrY2xYaj8ZZAL 5gRWFdsgTNq8i3AUUaaiS5jPQJEVJPdDXet8iGo6q5Ch3IGK+NjYdQ5TF1GFFUPXDxj4 NynQ== X-Gm-Message-State: AOAM533lcSY3zpyxcfBEN1DGqISL/megd0XBHxvvD5Ct++fUUJoEKWmA ogmJirlo/sGI9ODURsLJtmQhqZTa368= X-Google-Smtp-Source: ABdhPJw31xtieQefLUNyq0c5SGPFsrE8XBSO2n0ZO9of076lJxfYyre1vgBCyfW+Lgwk6X7rmY3acQ== X-Received: by 2002:a9d:1991:0:b0:5cd:b2a1:5c50 with SMTP id k17-20020a9d1991000000b005cdb2a15c50mr3683024otk.217.1650723980405; Sat, 23 Apr 2022 07:26:20 -0700 (PDT) Received: from carlos-mbp.lan (104-1-92-200.lightspeed.sntcca.sbcglobal.net. [104.1.92.200]) by smtp.gmail.com with ESMTPSA id s4-20020a0568301e0400b006015bafee43sm1869993otr.46.2022.04.23.07.26.19 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Apr 2022 07:26:20 -0700 (PDT) From: =?utf-8?q?Carlo_Marcelo_Arenas_Bel=C3=B3n?= To: git@vger.kernel.org Cc: gitster@pobox.com, avarab@gmail.com, sunshine@sunshineco.com, Johannes.Schindelin@gmx.de, =?utf-8?q?Carlo_Marcelo_Arenas_Bel=C3=B3n?= Subject: [PATCH v3 2/4] ci: avoid brew for installing perforce Date: Sat, 23 Apr 2022 07:25:57 -0700 Message-Id: <20220423142559.32507-3-carenas@gmail.com> X-Mailer: git-send-email 2.36.0.266.g59f845bde02 In-Reply-To: <20220423142559.32507-1-carenas@gmail.com> References: <20220422013911.7646-1-carenas@gmail.com> <20220423142559.32507-1-carenas@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Perfoce's cask in brew is meant[1] to be used only by humans, so replace its use from the CI with a scripted binary download which is less likely to fail, as it is done in Linux. Kept the logic together so it will be less likely to break when moved around as on the fly code changes in this area are settled, at which point it will also feasable to ammend it to avoid some of the hardcoded values by using similar variables to the ones Linux does. In that same line, a POSIX sh syntax is used instead of the similar one used in Linux in preparation for an unrelated future change that might change the shell currently configured for it. This change reintroduces the risk that the installed binaries might not work because of being quarantined that was fixed with 5ed9fc3fc86 (ci: prevent `perforce` from being quarantined, 2020-02-27) but fixing that now was also punted for simplicity and since the affected cloud provider is scheduled to be retired with an on the fly change, but should be addressed if that other change is not integrated further. The discussion on the need to keep 2 radically different versions of the binaries to be tested with Linux vs macOS or how to upgrade to newer versions now that brew won't do that automatically for us has been punted for now as well. On that line the now obsolete comment about it in lib.sh was originally being updated by this change but created conflicts as it is moved around by other on the fly changes, so will be addressed independently as well. [1] https://github.com/Homebrew/homebrew-cask/pull/122347#discussion_r856026584 Signed-off-by: Carlo Marcelo Arenas Belón --- ci/install-dependencies.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 41e9290fbdd..9da03350d09 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -37,13 +37,14 @@ macos-latest) test -z "$BREW_INSTALL_PACKAGES" || brew install $BREW_INSTALL_PACKAGES brew link --force gettext - brew install --cask --no-quarantine perforce || { - # Update the definitions and try again - cask_repo="$(brew --repository)"/Library/Taps/homebrew/homebrew-cask && - git -C "$cask_repo" pull --no-stat --ff-only && - brew install --cask --no-quarantine perforce - } || - brew install homebrew/cask/perforce + mkdir -p $HOME/bin + ( + cd $HOME/bin + wget -q "https://cdist2.perforce.com/perforce/r21.2/bin.macosx1015x86_64/helix-core-server.tgz" && + tar -xf helix-core-server.tgz + ) + PATH="$PATH:${HOME}/bin" + export PATH if test -n "$CC_PACKAGE" then From patchwork Sat Apr 23 14:25:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Carlo_Marcelo_Arenas_Bel=C3=B3n?= X-Patchwork-Id: 12824578 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B44DC433EF for ; Sat, 23 Apr 2022 14:26:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236098AbiDWO3h (ORCPT ); Sat, 23 Apr 2022 10:29:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236238AbiDWO3U (ORCPT ); Sat, 23 Apr 2022 10:29:20 -0400 Received: from mail-ot1-x336.google.com (mail-ot1-x336.google.com [IPv6:2607:f8b0:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 877ACDE97 for ; Sat, 23 Apr 2022 07:26:22 -0700 (PDT) Received: by mail-ot1-x336.google.com with SMTP id s21-20020a0568301e1500b006054da8e72dso7534207otr.1 for ; Sat, 23 Apr 2022 07:26:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NaTjakbHbtLWgyo9qqsKXQdcjxLkCn6nGZYUWvTPKhI=; b=SJNP342El9iQme3FM4r5iQrpOmNs8YYfGADtTE52C6rDlXXCceBchK/Kckt82qOAsb aZ9zAwap7UPd7h/M3kplZ5yTgIWrRCb805jP4SGWbRwQjiWp6yBEQuhCkvLD+CVuvs6P WxYoqTElx9IqzayfKG5sY+mwXJ2sBnz8zbB0mPVa8dido4Sr7mbKNBRuBmIDQV5qSjma 0IuVPdET6hqLnqXz/K62NLC7sugPVsXNkJUeynzZ2i5eQ1NAWUqU9V34D7uwK7SFhIsL CkF8N7Nz1dqa+gPR90YFB4vimy55spgI3rf8NRzZcvTI0mD1rqkkxgov5dv8lekjRY4e gDCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NaTjakbHbtLWgyo9qqsKXQdcjxLkCn6nGZYUWvTPKhI=; b=qAHR2j1tRkCqFHYz1H7CgqzWpaIjKM68To2Ds1vJZXyMzgdL3HVF5cd4Or0P0u9PXq VT0tSo1gpMoodcT6K2e8SG/r0ObzK2d31dk4hj5nMDplibbqqTVX0uXLAH52qM6CUMEV 58iD64xSZ4k+QWsdxqweHvLhDu3pZPvIU4rTnz4z7EwTmW3LIsJQ92XQljgYLnlGvv2d JWOG29yyQ4haDcXcYmcWPXTorVDzZt1RfPMppbMdcuUv0DE8TpokCnpyHi2Zzre4jlRp kQwX9wLByJBUWyr/K57gmt9fBeeh66ZonkAoRIFXxvZKWCb3Doty5RrPHYWvDA2zDdvw +YPA== X-Gm-Message-State: AOAM532cpik/hR6QAQYpK9NqBkHO9/DYpYsqYqH/V8h8mVZCm8PVclHU g2QIDZ8LH5JAbFFl6ltC/cvU639t/9I= X-Google-Smtp-Source: ABdhPJxI8KDlYqmJ/KMZ3d2fuzrAh7Ter97EqXU4NhO7QNmm+1IE30SAXJd1IM5ue/uuJYI28934/w== X-Received: by 2002:a9d:7618:0:b0:605:a132:7d57 with SMTP id k24-20020a9d7618000000b00605a1327d57mr481075otl.262.1650723981619; Sat, 23 Apr 2022 07:26:21 -0700 (PDT) Received: from carlos-mbp.lan (104-1-92-200.lightspeed.sntcca.sbcglobal.net. [104.1.92.200]) by smtp.gmail.com with ESMTPSA id s4-20020a0568301e0400b006015bafee43sm1869993otr.46.2022.04.23.07.26.20 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Apr 2022 07:26:21 -0700 (PDT) From: =?utf-8?q?Carlo_Marcelo_Arenas_Bel=C3=B3n?= To: git@vger.kernel.org Cc: gitster@pobox.com, avarab@gmail.com, sunshine@sunshineco.com, Johannes.Schindelin@gmx.de, =?utf-8?q?Carlo_Marcelo_Arenas_Bel=C3=B3n?= Subject: [PATCH v3 3/4] ci: reintroduce prevention from perforce being quarantined in macOS Date: Sat, 23 Apr 2022 07:25:58 -0700 Message-Id: <20220423142559.32507-4-carenas@gmail.com> X-Mailer: git-send-email 2.36.0.266.g59f845bde02 In-Reply-To: <20220423142559.32507-1-carenas@gmail.com> References: <20220422013911.7646-1-carenas@gmail.com> <20220423142559.32507-1-carenas@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 5ed9fc3fc86 (ci: prevent `perforce` from being quarantined, 2020-02-27) introduces this prevention for brew, but brew has been removed in a previous commit, so reintroduce an equivalent option to avoid a possible regression. This doesn't affect github actions (as configure now) and is therefore done silently to avoid any possible scary irrelevant messages. Signed-off-by: Carlo Marcelo Arenas Belón --- ci/install-dependencies.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 9da03350d09..46a23a33dbd 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -41,7 +41,8 @@ macos-latest) ( cd $HOME/bin wget -q "https://cdist2.perforce.com/perforce/r21.2/bin.macosx1015x86_64/helix-core-server.tgz" && - tar -xf helix-core-server.tgz + tar -xf helix-core-server.tgz && + sudo xattr -d com.apple.quarantine p4 p4d 2>/dev/null || true ) PATH="$PATH:${HOME}/bin" export PATH From patchwork Sat Apr 23 14:25:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Carlo_Marcelo_Arenas_Bel=C3=B3n?= X-Patchwork-Id: 12824579 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 918B7C433FE for ; Sat, 23 Apr 2022 14:26:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236102AbiDWO3j (ORCPT ); Sat, 23 Apr 2022 10:29:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229527AbiDWO3U (ORCPT ); Sat, 23 Apr 2022 10:29:20 -0400 Received: from mail-oo1-xc2a.google.com (mail-oo1-xc2a.google.com [IPv6:2607:f8b0:4864:20::c2a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 447A5DF6C for ; Sat, 23 Apr 2022 07:26:23 -0700 (PDT) Received: by mail-oo1-xc2a.google.com with SMTP id g30-20020a4a251e000000b0033a39d8340aso1937832ooa.5 for ; Sat, 23 Apr 2022 07:26:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EnjBN/XzFJ1WWKVcfokU97kW/LeR04cJJXFrJ6VzEkA=; b=KMVYfX5yu0tCC5YHRunQ5AHMbkycyvBpgJ3OniLJFiOyMWzweV9iw/uW4LyGfE/JOe Sl7QZd2ea6NA/Qp8KxkqKXMhkJLOnYHjWVb4mPRetBoQVSyfDUXTbe8Y7oV3wVJ8Y/4F 6LiC5o8aJL3/xZpHPwcf1r1bGqNv8NeG7AtoismH3AfSPMbVLd4plI7SMqUtKZV9BJYY +WoOSQ5oJL2X6qLf5c7Ig9s74A6c2t4xkhrm1ytLxMUNdjSfAxxYK+yE0tjFa3GXZIi0 dBbRkK8WQbtvYKvCx25C2QlBDFQQO91G8yi9JWS0IGChWWkmquqX3wUixc3Kf95lmVLU NjSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EnjBN/XzFJ1WWKVcfokU97kW/LeR04cJJXFrJ6VzEkA=; b=nyWY54qXWx1IzoPW5OKZmnWM7KHfktqRIOj+veyGGqJbGCIdNRFwrKlwqnV5xvBL8K axuTZ8N09iY1JU7790eFzcvg/KRBQRjRBZpQz3wi3JUcBLiBdyj3AULIQ37fnwCzzsKh UckxIa7HAFQafsMPx33n236H9aFLJKw3BXcI6jqZiEYJVPDLDQyN3r8v3bn0DbAhNeBs yUSWnioOjgzlzeJITiQS1VTAKYoKivvFPGAk4bP4XWF8Wg2qfjx71nSBpuBdP9U5fKFX Re5Dz5pIsaeYlURie8RpKkc4xtd7DJcGJEXPRM/+ulWFkD6UZJeietiMdulxP5HAxWy2 fzOw== X-Gm-Message-State: AOAM532XFCIgdtB4E1tU7ExWQ3CcjCJ2cfxq0HqF0oWYWSOpuopxaWrb LI6M71eEkDPhvBjS/tj26o4wOOurSS0= X-Google-Smtp-Source: ABdhPJwWxcE1SZkcHZjBA6/p8VtyhMZKj0F6SmThoq4XYouFDEtddPFkA8qMn9Lm87aaZndgsOzIow== X-Received: by 2002:a4a:8081:0:b0:33a:52ed:3b3b with SMTP id z1-20020a4a8081000000b0033a52ed3b3bmr3409507oof.26.1650723982489; Sat, 23 Apr 2022 07:26:22 -0700 (PDT) Received: from carlos-mbp.lan (104-1-92-200.lightspeed.sntcca.sbcglobal.net. [104.1.92.200]) by smtp.gmail.com with ESMTPSA id s4-20020a0568301e0400b006015bafee43sm1869993otr.46.2022.04.23.07.26.21 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Apr 2022 07:26:22 -0700 (PDT) From: =?utf-8?q?Carlo_Marcelo_Arenas_Bel=C3=B3n?= To: git@vger.kernel.org Cc: gitster@pobox.com, avarab@gmail.com, sunshine@sunshineco.com, Johannes.Schindelin@gmx.de Subject: [PATCH v3 4/4] CI: use https, not http to download binaries from perforce.com Date: Sat, 23 Apr 2022 07:25:59 -0700 Message-Id: <20220423142559.32507-5-carenas@gmail.com> X-Mailer: git-send-email 2.36.0.266.g59f845bde02 In-Reply-To: <20220423142559.32507-1-carenas@gmail.com> References: <20220422013911.7646-1-carenas@gmail.com> <20220423142559.32507-1-carenas@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Ævar Arnfjörð Bjarmason Since 522354d70f4 (Add Travis CI support, 2015-11-27) the CI has used http://filehost.perforce.com/perforce/ to download binaries from filehost.perforce.com, they were then moved to this script in 657343a602e (travis-ci: move Travis CI code into dedicated scripts, 2017-09-10). Let's use https instead for good measure. I don't think we need to worry about the DNS or network between the GitHub CI and perforce.com being MitM'd, but using https gives us extra validation of the payload at least, and is one less thing to worry about when checking where else we rely on non-TLS'd http connections. Signed-off-by: Ævar Arnfjörð Bjarmason --- ci/install-dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 46a23a33dbd..a2d3578f4e3 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -5,7 +5,7 @@ . ${0%/*}/lib.sh -P4WHENCE=http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION +P4WHENCE=https://filehost.perforce.com/perforce/r$LINUX_P4_VERSION LFSWHENCE=https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION UBUNTU_COMMON_PKGS="make libssl-dev libcurl4-openssl-dev libexpat-dev tcl tk gettext zlib1g-dev perl-modules liberror-perl libauthen-sasl-perl