From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.groups.io with SMTP id smtpd.web10.6867.1617801105645439637 for ; Wed, 07 Apr 2021 06:11:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=MkFN4m2x; spf=pass (domain: redhat.com, ip: 216.205.24.124, mailfrom: lersek@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617801104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jTXJrc5EUBZokcmQhh5mCLR547gWXPe33RjRexJKyfE=; b=MkFN4m2xG21MY/D9jEifU7CsHIAMu2UHK635ztBDh8OhY7goQkuM5qSU7U8wipaAhfo+ba gNKrhtipRBzERrR9hbWM5lzZJjaMsIE6DbyJ8hDgpI2CrkZ4WthnTjJfHwwnOkqV6z7ntD xF4lL61jbWRJabHSwRj68gn7+lzup1s= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-183-_Qy-YLjCOzWInavurJHe9Q-1; Wed, 07 Apr 2021 09:11:40 -0400 X-MC-Unique: _Qy-YLjCOzWInavurJHe9Q-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 01D2BE99C0; Wed, 7 Apr 2021 13:11:39 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-112-38.ams2.redhat.com [10.36.112.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0966570F5B; Wed, 7 Apr 2021 13:11:33 +0000 (UTC) Subject: Re: [Patch 1/1] UnitTestFrameworkPkg: Use TianoCore mirror of cmocka repository To: Michael D Kinney , devel@edk2.groups.io Cc: Sean Brogan , Bret Barkelew , Liming Gao , Andrew Fish , Leif Lindholm References: <20210406201134.1941-1-michael.d.kinney@intel.com> From: "Laszlo Ersek" Message-ID: Date: Wed, 7 Apr 2021 15:11:32 +0200 MIME-Version: 1.0 In-Reply-To: <20210406201134.1941-1-michael.d.kinney@intel.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=lersek@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 04/06/21 22:11, Michael D Kinney wrote: > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3301 > > The cmocka repository https://git.cryptomilk.org/projects/cmocka.git > has gone down a few times in past year. When it is down, it blocks > EDK II CI. A mirror of this repository has been created in the > TianoCore organization at https://github.com/tianocore/edk2-cmocka.git > and uses a GitHub Action to auto-sync changes from > https://git.cryptomilk.org/projects/cmocka.git. > > * Update .gitmodules to use https://github.com/tianocore/edk2-cmocka.git > instead of https://git.cryptomilk.org/projects/cmocka.git. > > * Update README.rst to reference the COPYING file in > https://github.com/tianocore/edk2-cmocka.git with the cmocka license. > > * Update Azure Pipelines YML files to remove a temporary workaround that > used an alternate GitHub mirror of cmocka. With the workaround removed, > EDK II CI always uses the TianoCore mirror of cmocka. > > Cc: Sean Brogan > Cc: Bret Barkelew > Cc: Liming Gao > Cc: Andrew Fish > Cc: Laszlo Ersek > Cc: Leif Lindholm > Signed-off-by: Michael D Kinney > --- > .azurepipelines/templates/platform-build-run-steps.yml | 3 --- > .azurepipelines/templates/pr-gate-steps.yml | 3 --- > .gitmodules | 2 +- > ReadMe.rst | 2 +- > 4 files changed, 2 insertions(+), 8 deletions(-) > > diff --git a/.azurepipelines/templates/platform-build-run-steps.yml b/.azurepipelines/templates/platform-build-run-steps.yml > index b712e2fafafb..97e7faa26682 100644 > --- a/.azurepipelines/templates/platform-build-run-steps.yml > +++ b/.azurepipelines/templates/platform-build-run-steps.yml > @@ -51,9 +51,6 @@ steps: > # Set default > - bash: echo "##vso[task.setvariable variable=pkg_count]${{ 1 }}" > > -# Use altername cmocka repo > -- bash: git config --global url.https://github.com/neverware-mirrors/cmocka.git.insteadOf https://git.cryptomilk.org/projects/cmocka.git > - > # Fetch the target branch so that pr_eval can diff them. > # Seems like azure pipelines/github changed checkout process in nov 2020. > - script: git fetch origin $(System.PullRequest.targetBranch) > diff --git a/.azurepipelines/templates/pr-gate-steps.yml b/.azurepipelines/templates/pr-gate-steps.yml > index 28edb453bddc..70c19a462194 100644 > --- a/.azurepipelines/templates/pr-gate-steps.yml > +++ b/.azurepipelines/templates/pr-gate-steps.yml > @@ -31,9 +31,6 @@ steps: > echo "##vso[task.setvariable variable=pkgs_to_build]${{ parameters.build_pkgs }}" > echo "##vso[task.setvariable variable=pkg_count]${{ 1 }}" > > -# Use altername cmocka repo > -- bash: git config --global url.https://github.com/neverware-mirrors/cmocka.git.insteadOf https://git.cryptomilk.org/projects/cmocka.git > - > # Fetch the target branch so that pr_eval can diff them. > # Seems like azure pipelines/github changed checkout process in nov 2020. > - script: git fetch origin $(System.PullRequest.targetBranch) > diff --git a/.gitmodules b/.gitmodules > index 0f06c09a29a1..b845c9ee3ff0 100644 > --- a/.gitmodules > +++ b/.gitmodules > @@ -6,7 +6,7 @@ > url = https://github.com/ucb-bar/berkeley-softfloat-3.git > [submodule "UnitTestFrameworkPkg/Library/CmockaLib/cmocka"] > path = UnitTestFrameworkPkg/Library/CmockaLib/cmocka > - url = https://git.cryptomilk.org/projects/cmocka.git > + url = https://github.com/tianocore/edk2-cmocka.git > [submodule "MdeModulePkg/Universal/RegularExpressionDxe/oniguruma"] > path = MdeModulePkg/Universal/RegularExpressionDxe/oniguruma > url = https://github.com/kkos/oniguruma > diff --git a/ReadMe.rst b/ReadMe.rst > index b754378646db..8f5db11281bf 100644 > --- a/ReadMe.rst > +++ b/ReadMe.rst > @@ -92,7 +92,7 @@ that are covered by additional licenses. > - `CryptoPkg/Library/OpensslLib/openssl `__ > - `MdeModulePkg/Library/BrotliCustomDecompressLib/brotli `__ > - `MdeModulePkg/Universal/RegularExpressionDxe/oniguruma `__ > -- `UnitTestFrameworkPkg/Library/CmockaLib/cmocka `__ > +- `UnitTestFrameworkPkg/Library/CmockaLib/cmocka `__ > - `RedfishPkg/Library/JsonLib/jansson `__ > > The EDK II Project is composed of packages. The maintainers for each package > Reviewed-by: Laszlo Ersek