Skip to content
This repository has been archived by the owner on Oct 15, 2024. It is now read-only.

Commit

Permalink
Revert "googletest: bump to v1.13.0"
Browse files Browse the repository at this point in the history
This reverts commit cf1488c.
  • Loading branch information
mpranj committed Mar 2, 2023
1 parent aa2acff commit 2c332eb
Show file tree
Hide file tree
Showing 30 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
run: |
cd "$RUNNER_TEMP"
mkdir -p "googletest"
curl -o gtest.tar.gz -L https://github.com/google/googletest/archive/release-1.13.0.tar.gz
curl -o gtest.tar.gz -L https://github.com/google/googletest/archive/release-1.12.1.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
Expand Down
2 changes: 1 addition & 1 deletion lgtm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/release-1.13.0.tar.gz
- curl -o gtest.tar.gz -L https://github.com/google/googletest/archive/release-1.12.1.tar.gz
- tar -zxvf gtest.tar.gz --strip-components=1 -C googletest
- rm gtest.tar.gz
- export GTEST_ROOT="$LGTM_WORKSPACE/googletest"
2 changes: 1 addition & 1 deletion scripts/docker/alpine/3.17/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ RUN pip3 install wheel

# Google Test
ENV GTEST_ROOT=/opt/gtest
ARG GTEST_VER=release-1.13.0
ARG GTEST_VER=release-1.12.1
RUN mkdir -p ${GTEST_ROOT} \
&& cd /tmp \
&& curl -o gtest.tar.gz \
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/alpine/3.17/release.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN apk update \

# Google Test
ENV GTEST_ROOT=/opt/gtest
ARG GTEST_VER=release-1.13.0
ARG GTEST_VER=release-1.12.1
RUN mkdir -p ${GTEST_ROOT} \
&& cd /tmp \
&& curl -o gtest.tar.gz \
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/arch/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN pip3 install wheel

# Google Test
ENV GTEST_ROOT=/opt/gtest
ARG GTEST_VER=release-1.13.0
ARG GTEST_VER=release-1.12.1
RUN mkdir -p ${GTEST_ROOT} \
&& cd /tmp \
&& curl -o gtest.tar.gz \
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/centos/stream8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ RUN pip3 install wheel

# Google Test
ENV GTEST_ROOT=/opt/gtest
ARG GTEST_VER=release-1.13.0
ARG GTEST_VER=release-1.12.1
RUN mkdir -p ${GTEST_ROOT} \
&& cd /tmp \
&& curl -o gtest.tar.gz \
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/cirrus/fedora/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ RUN dnf upgrade --refresh -y && dnf install -y \

# Google Test
ENV GTEST_ROOT=/opt/gtest
ARG GTEST_VER=release-1.13.0
ARG GTEST_VER=release-1.12.1
RUN mkdir -p ${GTEST_ROOT} \
&& cd /tmp \
&& curl -o gtest.tar.gz \
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/debian/bullseye/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ RUN update-alternatives --set lua-interpreter /usr/bin/lua5.4

# Google Test
ENV GTEST_ROOT=/opt/gtest
ARG GTEST_VER=release-1.13.0
ARG GTEST_VER=release-1.12.1
RUN mkdir -p ${GTEST_ROOT} \
&& cd /tmp \
&& curl -o gtest.tar.gz \
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/debian/bullseye/doc.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ RUN apt-get -y install \

# Google Test
ENV GTEST_ROOT=/opt/gtest
ARG GTEST_VER=release-1.13.0
ARG GTEST_VER=release-1.12.1
RUN mkdir -p ${GTEST_ROOT} \
&& cd /tmp \
&& curl -o gtest.tar.gz \
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/debian/bullseye/i386.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN dpkg --add-architecture i386 \

# Google Test
ENV GTEST_ROOT=/opt/gtest
ARG GTEST_VER=release-1.13.0
ARG GTEST_VER=release-1.12.1
RUN mkdir -p ${GTEST_ROOT} \
&& cd /tmp \
&& curl -o gtest.tar.gz \
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/debian/bullseye/minimal.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN apt-get update && apt-get -y install \

# Google Test
ENV GTEST_ROOT=/opt/gtest
ARG GTEST_VER=release-1.13.0
ARG GTEST_VER=release-1.12.1
RUN mkdir -p ${GTEST_ROOT} \
&& cd /tmp \
&& curl -o gtest.tar.gz \
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/debian/buster/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ RUN update-alternatives --set lua-interpreter /usr/bin/lua5.3

# Google Test
ENV GTEST_ROOT=/opt/gtest
ARG GTEST_VER=release-1.13.0
ARG GTEST_VER=release-1.12.1
RUN mkdir -p ${GTEST_ROOT} \
&& cd /tmp \
&& curl -o gtest.tar.gz \
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/debian/buster/i386.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ RUN pip3 install wheel

# Google Test
ENV GTEST_ROOT=/opt/gtest
ARG GTEST_VER=release-1.13.0
ARG GTEST_VER=release-1.12.1
RUN mkdir -p ${GTEST_ROOT} \
&& cd /tmp \
&& curl -o gtest.tar.gz \
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/debian/buster/minimal.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN apt-get update && apt-get -y install \

# Google Test
ENV GTEST_ROOT=/opt/gtest
ARG GTEST_VER=release-1.13.0
ARG GTEST_VER=release-1.12.1
RUN mkdir -p ${GTEST_ROOT} \
&& cd /tmp \
&& curl -o gtest.tar.gz \
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/debian/sid/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ RUN ldconfig

# Google Test
ENV GTEST_ROOT=/opt/gtest
ARG GTEST_VER=release-1.13.0
ARG GTEST_VER=release-1.12.1
RUN mkdir -p ${GTEST_ROOT} \
&& cd /tmp \
&& curl -o gtest.tar.gz \
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/fedora/31/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ RUN pip3 install wheel

# Google Test
ENV GTEST_ROOT=/opt/gtest
ARG GTEST_VER=release-1.13.0
ARG GTEST_VER=release-1.12.1
RUN mkdir -p ${GTEST_ROOT} \
&& cd /tmp \
&& curl -o gtest.tar.gz \
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/fedora/32/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ RUN pip3 install wheel

# Google Test
ENV GTEST_ROOT=/opt/gtest
ARG GTEST_VER=release-1.13.0
ARG GTEST_VER=release-1.12.1
RUN mkdir -p ${GTEST_ROOT} \
&& cd /tmp \
&& curl -o gtest.tar.gz \
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/fedora/33/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ RUN pip3 install wheel

# Google Test
ENV GTEST_ROOT=/opt/gtest
ARG GTEST_VER=release-1.13.0
ARG GTEST_VER=release-1.12.1
RUN mkdir -p ${GTEST_ROOT} \
&& cd /tmp \
&& curl -o gtest.tar.gz \
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/fedora/34/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ RUN pip3 install wheel

# Google Test
ENV GTEST_ROOT=/opt/gtest
ARG GTEST_VER=release-1.13.0
ARG GTEST_VER=release-1.12.1
RUN mkdir -p ${GTEST_ROOT} \
&& cd /tmp \
&& curl -o gtest.tar.gz \
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/fedora/35/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ RUN pip3 install wheel

# Google Test
ENV GTEST_ROOT=/opt/gtest
ARG GTEST_VER=release-1.13.0
ARG GTEST_VER=release-1.12.1
RUN mkdir -p ${GTEST_ROOT} \
&& cd /tmp \
&& curl -o gtest.tar.gz \
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/fedora/36/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ RUN pip3 install wheel

# Google Test
ENV GTEST_ROOT=/opt/gtest
ARG GTEST_VER=release-1.13.0
ARG GTEST_VER=release-1.12.1
RUN mkdir -p ${GTEST_ROOT} \
&& cd /tmp \
&& curl -o gtest.tar.gz \
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/fedora/37/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ RUN pip3 install wheel

# Google Test
ENV GTEST_ROOT=/opt/gtest
ARG GTEST_VER=release-1.13.0
ARG GTEST_VER=release-1.12.1
RUN mkdir -p ${GTEST_ROOT} \
&& cd /tmp \
&& curl -o gtest.tar.gz \
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/jenkinsnode/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ RUN pip3 install wheel

# Google Test
ENV GTEST_ROOT=/opt/gtest
ARG GTEST_VER=release-1.13.0
ARG GTEST_VER=release-1.12.1
RUN mkdir -p ${GTEST_ROOT} \
&& cd /tmp \
&& curl -o gtest.tar.gz \
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/opensuse/15.3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ RUN pip3 install wheel

# Google Test
ENV GTEST_ROOT=/opt/gtest
ARG GTEST_VER=release-1.13.0
ARG GTEST_VER=release-1.12.1
RUN mkdir -p ${GTEST_ROOT} \
&& cd /tmp \
&& curl -o gtest.tar.gz \
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/ubuntu/bionic/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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=release-1.13.0
ARG GTEST_VER=release-1.12.1
RUN mkdir -p ${GTEST_ROOT} \
&& cd /tmp \
&& curl -o gtest.tar.gz \
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/ubuntu/focal/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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=release-1.13.0
ARG GTEST_VER=release-1.12.1
RUN mkdir -p ${GTEST_ROOT} \
&& cd /tmp \
&& curl -o gtest.tar.gz \
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/website/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN apt-get update && apt-get -y install \

# Google Test
ENV GTEST_ROOT=/opt/gtest
ARG GTEST_VER=release-1.13.0
ARG GTEST_VER=release-1.12.1
RUN mkdir -p ${GTEST_ROOT} \
&& cd /tmp \
&& curl -o gtest.tar.gz \
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/webui/base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN apt-get install -y nodejs golang-go

# Google Test
ENV GTEST_ROOT=/opt/gtest
ARG GTEST_VER=release-1.13.0
ARG GTEST_VER=release-1.12.1
RUN mkdir -p ${GTEST_ROOT} \
&& cd /tmp \
&& curl -o gtest.tar.gz \
Expand Down
2 changes: 1 addition & 1 deletion scripts/vagrant/ubuntu/artful32/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/release-1.13.0.tar.gz \
-L https://github.com/google/googletest/archive/release-1.12.1.tar.gz \
&& tar -zxvf gtest.tar.gz --strip-components=1 -C /opt/gtest \
&& rm gtest.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if (ENABLE_TESTING)
download_project (
PROJ googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG release-1.13.0 QUIET UPDATE_DISCONNECTED 1)
GIT_TAG release-1.12.1 QUIET UPDATE_DISCONNECTED 1)
endif (DEFINED GOOGLETEST_ROOT)

# Prevent GoogleTest from overriding our compiler/linker options when building with Visual Studio
Expand Down

0 comments on commit 2c332eb

Please sign in to comment.