From 2ad22420a710dc07e3b644f91a5b55c09c39ecf3 Mon Sep 17 00:00:00 2001 From: Michael D Kinney Date: Tue, 6 Apr 2021 12:04:09 -0700 Subject: 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 Cc: Bret Barkelew Cc: Liming Gao Cc: Andrew Fish Cc: Laszlo Ersek Cc: Leif Lindholm Signed-off-by: Michael D Kinney Reviewed-by: Liming Gao Reviewed-by: Laszlo Ersek --- .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 b712e2f..97e7faa 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 28edb45..70c19a4 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 0f06c09..b845c9e 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 b754378..8f5db11 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 -- cgit v1.1