UnitTestFrameworkPkg: Use TianoCore mirror of cmocka repository

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 <sean.brogan@microsoft.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Andrew Fish <afish@apple.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

diff --git a/.azurepipelines/templates/platform-build-run-steps.yml b/.azurepipelines/templates/platform-build-run-steps.yml
index b712e2fafafba4a049f676f46014eb424ba4d7bd..97e7faa266825563df97284b3e6f05f49e72d159 100644 (file)
--- a/.azurepipelines/templates/platform-build-run-steps.yml
+++ b/.azurepipelines/templates/platform-build-run-steps.yml
@@ -51,9 +51,6 @@ steps:
 # Set default\r
 - bash: echo "##vso[task.setvariable variable=pkg_count]${{ 1 }}"\r
 \r
-# Use altername cmocka repo\r
-- bash: git config --global url.https://github.com/neverware-mirrors/cmocka.git.insteadOf https://git.cryptomilk.org/projects/cmocka.git\r
-\r
 # Fetch the target branch so that pr_eval can diff them.\r
 # Seems like azure pipelines/github changed checkout process in nov 2020.\r
 - script: git fetch origin $(System.PullRequest.targetBranch)\r

diff --git a/.azurepipelines/templates/pr-gate-steps.yml b/.azurepipelines/templates/pr-gate-steps.yml
index 28edb453bddccaa348bc9b02007e7a9056bb1df0..70c19a462194e44dc898b6aea81f04a5a210d8a9 100644 (file)
--- 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 }}"\r
     echo "##vso[task.setvariable variable=pkg_count]${{ 1 }}"\r
 \r
-# Use altername cmocka repo\r
-- bash: git config --global url.https://github.com/neverware-mirrors/cmocka.git.insteadOf https://git.cryptomilk.org/projects/cmocka.git\r
-\r
 # Fetch the target branch so that pr_eval can diff them.\r
 # Seems like azure pipelines/github changed checkout process in nov 2020.\r
 - script: git fetch origin $(System.PullRequest.targetBranch)\r

diff --git a/.gitmodules b/.gitmodules
index 0f06c09a29a1d2e44912c772c2994a5756dc8233..b845c9ee3ff00e6b4a7c76820d80eccf30af24bc 100644 (file)
--- 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 b754378646db82b1fb5e5fddc07da32297baeabb..8f5db11281bf87d5197b62fec669c421de35a4e9 100644 (file)
--- a/ReadMe.rst
+++ b/ReadMe.rst
@@ -92,7 +92,7 @@ that are covered by additional licenses.
 -  `CryptoPkg/Library/OpensslLib/openssl <https://github.com/openssl/openssl/blob/e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72/LICENSE>`__\r
 -  `MdeModulePkg/Library/BrotliCustomDecompressLib/brotli <https://github.com/google/brotli/blob/666c3280cc11dc433c303d79a83d4ffbdd12cc8d/LICENSE>`__\r
 -  `MdeModulePkg/Universal/RegularExpressionDxe/oniguruma <https://github.com/kkos/oniguruma/blob/abfc8ff81df4067f309032467785e06975678f0d/COPYING>`__\r
--  `UnitTestFrameworkPkg/Library/CmockaLib/cmocka <https://git.cryptomilk.org/projects/cmocka.git/tree/COPYING?h=cmocka-1.1.5&id=f5e2cd77c88d9f792562888d2b70c5a396bfbf7a>`__\r
+-  `UnitTestFrameworkPkg/Library/CmockaLib/cmocka <https://github.com/tianocore/edk2-cmocka/blob/f5e2cd77c88d9f792562888d2b70c5a396bfbf7a/COPYING>`__\r
 -  `RedfishPkg/Library/JsonLib/jansson <https://github.com/akheron/jansson/blob/2882ead5bb90cf12a01b07b2c2361e24960fae02/LICENSE>`__\r
 \r
 The EDK II Project is composed of packages. The maintainers for each package\r