From 4b75d7a16abcb010714e121a8107d2e6db5b73a0 Mon Sep 17 00:00:00 2001 From: Tatsuhiko Kubo Date: Thu, 11 Jul 2024 21:48:08 +0900 Subject: [PATCH 1/2] ci: update googletest to 1.14.0. --- .github/workflows/cpp.yml | 8 ++++---- test/SConstruct | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml index 865259f..4471839 100644 --- a/.github/workflows/cpp.yml +++ b/.github/workflows/cpp.yml @@ -6,15 +6,15 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install scons and gtest run: | sudo apt-get install -y scons sudo apt-get install -y cmake scons - wget https://github.com/google/googletest/archive/release-1.11.0.zip - unzip -q release-1.11.0.zip - cd googletest-release-1.11.0 + wget https://github.com/google/googletest/archive/release-1.14.0.zip + unzip -q release-1.14.0.zip + cd googletest-release-1.14.0 cmake . make sudo make install diff --git a/test/SConstruct b/test/SConstruct index 37873dd..8b1883e 100644 --- a/test/SConstruct +++ b/test/SConstruct @@ -11,7 +11,7 @@ def path_chomp(path): env = Environment( CPPFLAGS=['-Wall', '-O2'], CPPPATH=['..'], - CXXFLAGS="-std=c++11", + CXXFLAGS="-std=c++14", ) conf = Configure(env); From 7912efa7c9cb0da1bb728b8cbfc6faa4879ecd06 Mon Sep 17 00:00:00 2001 From: Tatsuhiko Kubo Date: Thu, 11 Jul 2024 21:52:31 +0900 Subject: [PATCH 2/2] ci: fix download error --- .github/workflows/cpp.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml index 4471839..4eae9e1 100644 --- a/.github/workflows/cpp.yml +++ b/.github/workflows/cpp.yml @@ -12,9 +12,9 @@ jobs: run: | sudo apt-get install -y scons sudo apt-get install -y cmake scons - wget https://github.com/google/googletest/archive/release-1.14.0.zip - unzip -q release-1.14.0.zip - cd googletest-release-1.14.0 + wget https://github.com/google/googletest/archive/refs/tags/v1.14.0.tar.gz + tar zxvf v1.14.0.tar.gz + cd googletest-1.14.0 cmake . make sudo make install