Revert "googletest: fix changed upstream release URLs/tags"

This reverts commit 5e80d13.
ElektraInitiative · Mar 2, 2023 · aa2acff · aa2acff
1 parent 865759a
commit aa2acff
Show file tree

Hide file tree

Showing 30 changed files with 30 additions and 30 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -31,7 +31,7 @@ jobs:
         run: |
           cd "$RUNNER_TEMP"
           mkdir -p "googletest"
-          curl -o gtest.tar.gz -L https://github.com/google/googletest/archive/v1.13.0.tar.gz
+          curl -o gtest.tar.gz -L https://github.com/google/googletest/archive/release-1.13.0.tar.gz
           tar -zxvf gtest.tar.gz --strip-components=1 -C googletest
           rm gtest.tar.gz
           export GTEST_ROOT="$RUNNER_TEMP/googletest" && echo "GTEST_ROOT=$GTEST_ROOT" >> $GITHUB_ENV

diff --git a/lgtm.yml b/lgtm.yml
@@ -6,7 +6,7 @@ extraction:
       # we download Google Test manually.
       - cd "$LGTM_WORKSPACE"
       - mkdir -p "googletest"
-      - curl -o gtest.tar.gz -L https://github.com/google/googletest/archive/v1.13.0.tar.gz
+      - curl -o gtest.tar.gz -L https://github.com/google/googletest/archive/release-1.13.0.tar.gz
       - tar -zxvf gtest.tar.gz --strip-components=1 -C googletest
       - rm gtest.tar.gz
       - export GTEST_ROOT="$LGTM_WORKSPACE/googletest"
diff --git a/scripts/docker/alpine/3.17/Dockerfile b/scripts/docker/alpine/3.17/Dockerfile
@@ -19,7 +19,7 @@ RUN pip3 install wheel
 
 # Google Test
 ENV GTEST_ROOT=/opt/gtest
-ARG GTEST_VER=v1.13.0
+ARG GTEST_VER=release-1.13.0
 RUN mkdir -p ${GTEST_ROOT} \
     && cd /tmp \
     && curl -o gtest.tar.gz \

diff --git a/scripts/docker/alpine/3.17/release.Dockerfile b/scripts/docker/alpine/3.17/release.Dockerfile
@@ -22,7 +22,7 @@ RUN apk update \
 
 # Google Test
 ENV GTEST_ROOT=/opt/gtest
-ARG GTEST_VER=v1.13.0
+ARG GTEST_VER=release-1.13.0
 RUN mkdir -p ${GTEST_ROOT} \
     && cd /tmp \
     && curl -o gtest.tar.gz \

diff --git a/scripts/docker/arch/Dockerfile b/scripts/docker/arch/Dockerfile
@@ -18,7 +18,7 @@ RUN pip3 install wheel
 
 # Google Test
 ENV GTEST_ROOT=/opt/gtest
-ARG GTEST_VER=v1.13.0
+ARG GTEST_VER=release-1.13.0
 RUN mkdir -p ${GTEST_ROOT} \
     && cd /tmp \
     && curl -o gtest.tar.gz \

diff --git a/scripts/docker/centos/stream8/Dockerfile b/scripts/docker/centos/stream8/Dockerfile
@@ -78,7 +78,7 @@ RUN pip3 install wheel
 
 # Google Test
 ENV GTEST_ROOT=/opt/gtest
-ARG GTEST_VER=v1.13.0
+ARG GTEST_VER=release-1.13.0
 RUN mkdir -p ${GTEST_ROOT} \
     && cd /tmp \
     && curl -o gtest.tar.gz \

diff --git a/scripts/docker/cirrus/fedora/Dockerfile b/scripts/docker/cirrus/fedora/Dockerfile
@@ -52,7 +52,7 @@ RUN dnf upgrade --refresh -y && dnf install -y \
 
 # Google Test
 ENV GTEST_ROOT=/opt/gtest
-ARG GTEST_VER=v1.13.0
+ARG GTEST_VER=release-1.13.0
 RUN mkdir -p ${GTEST_ROOT} \
     && cd /tmp \
     && curl -o gtest.tar.gz \

diff --git a/scripts/docker/debian/bullseye/Dockerfile b/scripts/docker/debian/bullseye/Dockerfile
@@ -94,7 +94,7 @@ RUN update-alternatives --set lua-interpreter /usr/bin/lua5.4
 
 # Google Test
 ENV GTEST_ROOT=/opt/gtest
-ARG GTEST_VER=v1.13.0
+ARG GTEST_VER=release-1.13.0
 RUN mkdir -p ${GTEST_ROOT} \
     && cd /tmp \
     && curl -o gtest.tar.gz \

diff --git a/scripts/docker/debian/bullseye/doc.Dockerfile b/scripts/docker/debian/bullseye/doc.Dockerfile
@@ -24,7 +24,7 @@ RUN apt-get -y install \
 
 # Google Test
 ENV GTEST_ROOT=/opt/gtest
-ARG GTEST_VER=v1.13.0
+ARG GTEST_VER=release-1.13.0
 RUN mkdir -p ${GTEST_ROOT} \
     && cd /tmp \
     && curl -o gtest.tar.gz \

diff --git a/scripts/docker/debian/bullseye/i386.Dockerfile b/scripts/docker/debian/bullseye/i386.Dockerfile
@@ -22,7 +22,7 @@ RUN dpkg --add-architecture i386 \
 
 # Google Test
 ENV GTEST_ROOT=/opt/gtest
-ARG GTEST_VER=v1.13.0
+ARG GTEST_VER=release-1.13.0
 RUN mkdir -p ${GTEST_ROOT} \
     && cd /tmp \
     && curl -o gtest.tar.gz \

diff --git a/scripts/docker/debian/bullseye/minimal.Dockerfile b/scripts/docker/debian/bullseye/minimal.Dockerfile
@@ -9,7 +9,7 @@ RUN apt-get update && apt-get -y install \
 
 # Google Test
 ENV GTEST_ROOT=/opt/gtest
-ARG GTEST_VER=v1.13.0
+ARG GTEST_VER=release-1.13.0
 RUN mkdir -p ${GTEST_ROOT} \
     && cd /tmp \
     && curl -o gtest.tar.gz \

diff --git a/scripts/docker/debian/buster/Dockerfile b/scripts/docker/debian/buster/Dockerfile
@@ -92,7 +92,7 @@ RUN update-alternatives --set lua-interpreter /usr/bin/lua5.3
 
 # Google Test
 ENV GTEST_ROOT=/opt/gtest
-ARG GTEST_VER=v1.13.0
+ARG GTEST_VER=release-1.13.0
 RUN mkdir -p ${GTEST_ROOT} \
     && cd /tmp \
     && curl -o gtest.tar.gz \

diff --git a/scripts/docker/debian/buster/i386.Dockerfile b/scripts/docker/debian/buster/i386.Dockerfile
@@ -24,7 +24,7 @@ RUN pip3 install wheel
 
 # Google Test
 ENV GTEST_ROOT=/opt/gtest
-ARG GTEST_VER=v1.13.0
+ARG GTEST_VER=release-1.13.0
 RUN mkdir -p ${GTEST_ROOT} \
     && cd /tmp \
     && curl -o gtest.tar.gz \

diff --git a/scripts/docker/debian/buster/minimal.Dockerfile b/scripts/docker/debian/buster/minimal.Dockerfile
@@ -9,7 +9,7 @@ RUN apt-get update && apt-get -y install \
 
 # Google Test
 ENV GTEST_ROOT=/opt/gtest
-ARG GTEST_VER=v1.13.0
+ARG GTEST_VER=release-1.13.0
 RUN mkdir -p ${GTEST_ROOT} \
     && cd /tmp \
     && curl -o gtest.tar.gz \

diff --git a/scripts/docker/debian/sid/Dockerfile b/scripts/docker/debian/sid/Dockerfile
@@ -76,7 +76,7 @@ RUN ldconfig
 
 # Google Test
 ENV GTEST_ROOT=/opt/gtest
-ARG GTEST_VER=v1.13.0
+ARG GTEST_VER=release-1.13.0
 RUN mkdir -p ${GTEST_ROOT} \
     && cd /tmp \
     && curl -o gtest.tar.gz \

diff --git a/scripts/docker/fedora/31/Dockerfile b/scripts/docker/fedora/31/Dockerfile
@@ -64,7 +64,7 @@ RUN pip3 install wheel
 
 # Google Test
 ENV GTEST_ROOT=/opt/gtest
-ARG GTEST_VER=v1.13.0
+ARG GTEST_VER=release-1.13.0
 RUN mkdir -p ${GTEST_ROOT} \
     && cd /tmp \
     && curl -o gtest.tar.gz \

diff --git a/scripts/docker/fedora/32/Dockerfile b/scripts/docker/fedora/32/Dockerfile
@@ -65,7 +65,7 @@ RUN pip3 install wheel
 
 # Google Test
 ENV GTEST_ROOT=/opt/gtest
-ARG GTEST_VER=v1.13.0
+ARG GTEST_VER=release-1.13.0
 RUN mkdir -p ${GTEST_ROOT} \
     && cd /tmp \
     && curl -o gtest.tar.gz \

diff --git a/scripts/docker/fedora/33/Dockerfile b/scripts/docker/fedora/33/Dockerfile
@@ -77,7 +77,7 @@ RUN pip3 install wheel
 
 # Google Test
 ENV GTEST_ROOT=/opt/gtest
-ARG GTEST_VER=v1.13.0
+ARG GTEST_VER=release-1.13.0
 RUN mkdir -p ${GTEST_ROOT} \
     && cd /tmp \
     && curl -o gtest.tar.gz \

diff --git a/scripts/docker/fedora/34/Dockerfile b/scripts/docker/fedora/34/Dockerfile
@@ -77,7 +77,7 @@ RUN pip3 install wheel
 
 # Google Test
 ENV GTEST_ROOT=/opt/gtest
-ARG GTEST_VER=v1.13.0
+ARG GTEST_VER=release-1.13.0
 RUN mkdir -p ${GTEST_ROOT} \
     && cd /tmp \
     && curl -o gtest.tar.gz \

diff --git a/scripts/docker/fedora/35/Dockerfile b/scripts/docker/fedora/35/Dockerfile
@@ -77,7 +77,7 @@ RUN pip3 install wheel
 
 # Google Test
 ENV GTEST_ROOT=/opt/gtest
-ARG GTEST_VER=v1.13.0
+ARG GTEST_VER=release-1.13.0
 RUN mkdir -p ${GTEST_ROOT} \
     && cd /tmp \
     && curl -o gtest.tar.gz \

diff --git a/scripts/docker/fedora/36/Dockerfile b/scripts/docker/fedora/36/Dockerfile
@@ -76,7 +76,7 @@ RUN pip3 install wheel
 
 # Google Test
 ENV GTEST_ROOT=/opt/gtest
-ARG GTEST_VER=v1.13.0
+ARG GTEST_VER=release-1.13.0
 RUN mkdir -p ${GTEST_ROOT} \
     && cd /tmp \
     && curl -o gtest.tar.gz \

diff --git a/scripts/docker/fedora/37/Dockerfile b/scripts/docker/fedora/37/Dockerfile
@@ -76,7 +76,7 @@ RUN pip3 install wheel
 
 # Google Test
 ENV GTEST_ROOT=/opt/gtest
-ARG GTEST_VER=v1.13.0
+ARG GTEST_VER=release-1.13.0
 RUN mkdir -p ${GTEST_ROOT} \
     && cd /tmp \
     && curl -o gtest.tar.gz \

diff --git a/scripts/docker/jenkinsnode/Dockerfile b/scripts/docker/jenkinsnode/Dockerfile
@@ -50,7 +50,7 @@ RUN pip3 install wheel
 
 # Google Test
 ENV GTEST_ROOT=/opt/gtest
-ARG GTEST_VER=v1.13.0
+ARG GTEST_VER=release-1.13.0
 RUN mkdir -p ${GTEST_ROOT} \
     && cd /tmp \
     && curl -o gtest.tar.gz \

diff --git a/scripts/docker/opensuse/15.3/Dockerfile b/scripts/docker/opensuse/15.3/Dockerfile
@@ -68,7 +68,7 @@ RUN pip3 install wheel
 
 # Google Test
 ENV GTEST_ROOT=/opt/gtest
-ARG GTEST_VER=v1.13.0
+ARG GTEST_VER=release-1.13.0
 RUN mkdir -p ${GTEST_ROOT} \
     && cd /tmp \
     && curl -o gtest.tar.gz \

diff --git a/scripts/docker/ubuntu/bionic/Dockerfile b/scripts/docker/ubuntu/bionic/Dockerfile
@@ -61,7 +61,7 @@ RUN update-alternatives --install /usr/bin/lua lua-interpreter /usr/bin/lua5.3 1
 
 # Google Test
 ENV GTEST_ROOT=/opt/gtest
-ARG GTEST_VER=v1.13.0
+ARG GTEST_VER=release-1.13.0
 RUN mkdir -p ${GTEST_ROOT} \
     && cd /tmp \
     && curl -o gtest.tar.gz \

diff --git a/scripts/docker/ubuntu/focal/Dockerfile b/scripts/docker/ubuntu/focal/Dockerfile
@@ -73,7 +73,7 @@ RUN wget https://downloads.sourceforge.net/swig/swig-4.0.2.tar.gz && \
 
 # Google Test
 ENV GTEST_ROOT=/opt/gtest
-ARG GTEST_VER=v1.13.0
+ARG GTEST_VER=release-1.13.0
 RUN mkdir -p ${GTEST_ROOT} \
     && cd /tmp \
     && curl -o gtest.tar.gz \

diff --git a/scripts/docker/website/Dockerfile b/scripts/docker/website/Dockerfile
@@ -15,7 +15,7 @@ RUN apt-get update && apt-get -y install \
 
 # Google Test
 ENV GTEST_ROOT=/opt/gtest
-ARG GTEST_VER=v1.13.0
+ARG GTEST_VER=release-1.13.0
 RUN mkdir -p ${GTEST_ROOT} \
     && cd /tmp \
     && curl -o gtest.tar.gz \

diff --git a/scripts/docker/webui/base/Dockerfile b/scripts/docker/webui/base/Dockerfile
@@ -16,7 +16,7 @@ RUN apt-get install -y nodejs golang-go
 
 # Google Test
 ENV GTEST_ROOT=/opt/gtest
-ARG GTEST_VER=v1.13.0
+ARG GTEST_VER=release-1.13.0
 RUN mkdir -p ${GTEST_ROOT} \
     && cd /tmp \
     && curl -o gtest.tar.gz \

diff --git a/scripts/vagrant/ubuntu/artful32/Vagrantfile b/scripts/vagrant/ubuntu/artful32/Vagrantfile
@@ -87,7 +87,7 @@ Vagrant.configure("2") do |config|
     mkdir -p /opt/gtest \
     && cd /tmp \
     && curl -o gtest.tar.gz \
-      -L https://github.com/google/googletest/archive/v1.13.0.tar.gz \
+      -L https://github.com/google/googletest/archive/release-1.13.0.tar.gz \
     && tar -zxvf gtest.tar.gz --strip-components=1 -C /opt/gtest \
     && rm gtest.tar.gz
 

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -23,7 +23,7 @@ if (ENABLE_TESTING)
 		download_project (
 			PROJ googletest
 			GIT_REPOSITORY https://github.com/google/googletest.git
-			GIT_TAG v1.13.0 QUIET UPDATE_DISCONNECTED 1)
+			GIT_TAG release-1.13.0 QUIET UPDATE_DISCONNECTED 1)
 	endif (DEFINED GOOGLETEST_ROOT)
 
 	# Prevent GoogleTest from overriding our compiler/linker options when building with Visual Studio