From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mx.groups.io with SMTP id smtpd.web10.68.1617739905663707379 for ; Tue, 06 Apr 2021 13:11:45 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.20, mailfrom: michael.d.kinney@intel.com) IronPort-SDR: 1i6F4mWY1ZY0TUrC4I+GTcuXxvuxENMKGNlEM7kk/JBq9lzhJSRC9Qbogak58V8b1MrtMbspRA 5kO/SFTVZQLg== X-IronPort-AV: E=McAfee;i="6000,8403,9946"; a="180280158" X-IronPort-AV: E=Sophos;i="5.82,201,1613462400"; d="scan'208";a="180280158" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Apr 2021 13:11:44 -0700 IronPort-SDR: UPYPwIYFAroGmX5HXmuLMtIlueeW7/2Dp6ZwkNCMVzmYbonyLo8RQj8wf6LEGfzaAIwSlgEcIC PHwaBDabyV0g== X-IronPort-AV: E=Sophos;i="5.82,201,1613462400"; d="scan'208";a="519168151" Received: from mdkinney-mobl2.amr.corp.intel.com ([10.212.179.169]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Apr 2021 13:11:43 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Sean Brogan , Bret Barkelew , Liming Gao , Andrew Fish , Laszlo Ersek , Leif Lindholm Subject: [Patch 1/1] UnitTestFrameworkPkg: Use TianoCore mirror of cmocka repository Date: Tue, 6 Apr 2021 13:11:34 -0700 Message-Id: <20210406201134.1941-1-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.31.1.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 -- 2.31.1.windows.1