diff --git a/Compiler/gtest/build b/Compiler/gtest/build index 41fcd97..cec372a 100755 --- a/Compiler/gtest/build +++ b/Compiler/gtest/build @@ -1,6 +1,10 @@ #!/usr/bin/env modbuild -pbuild::set_download_url "https://github.com/google/googletest/archive/release-1.8.1.tar.gz" +if (( V_MAJOR == 1 )) && (( V_MINOR <= 12 )); then + pbuild::set_download_url "https://github.com/google/googletest/archive/refs/tags/release-${V_PKG}.tar.gz" +else + pbuild::set_download_url "https://github.com/google/googletest/archive/refs/tags/v${V_PKG}.tar.gz" +fi pbuild::add_to_group 'Compiler' if (( V_MAJOR == 1 )) && (( V_MINOR <= 7 )); then diff --git a/Compiler/gtest/files/variants.rhel6 b/Compiler/gtest/files/variants.rhel6 index 27f955a..ea7fd53 100644 --- a/Compiler/gtest/files/variants.rhel6 +++ b/Compiler/gtest/files/variants.rhel6 @@ -1,5 +1,7 @@ -gtest/1.7.0 stable gcc/{5.4.0,6.4.0,7.3.0,7.4.0} b:cmake/3.10.3 -gtest/1.8.1 stable gcc/{5.5.0,6.4.0,7.4.0,8.3.0,9.2.0} b:cmake/3.10.3 -gtest/1.10.0 stable gcc/{7.5.0,8.4.0,9.3.0,10.2.0,10.3.0} b:cmake/3.15.5 -gtest/1.11.0 stable gcc/{7.5.0,8.5.0,9.5.0,10.3.0,10.4.0} b:cmake/3.15.5 -gtest/1.13.0 stable gcc/10.2.0 b:cmake/3.15.5 +gtest/1.7.0 deprecated gcc/{5.4.0,6.4.0,7.3.0,7.4.0} b:cmake/3.10.3 +gtest/1.8.1 deprecated gcc/{5.5.0,6.4.0,7.4.0,8.3.0,9.2.0} b:cmake/3.10.3 +gtest/1.10.0 deprecated gcc/{7.5.0,8.4.0,9.3.0,10.2.0,10.3.0} b:cmake/3.15.5 +gtest/1.11.0 deprecated gcc/{7.5.0,8.5.0,9.5.0,10.3.0,10.4.0} b:cmake/3.15.5 +gtest/1.11.0-1 stable gcc/{7.5.0,8.5.0,9.5.0,10.4.0,11.4.0,12.3.0,13.1.0} b:cmake/3.15.5 +gtest/1.13.0 deprecated gcc/10.2.0 b:cmake/3.15.5 +gtest/1.13.0-1 stable gcc/{7.5.0,8.5.0,9.5.0,10.4.0,11.4.0,12.3.0,13.1.0} b:cmake/3.15.5