aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add ubuntu 21.10 to ci (#4446)

Browse source 
* add ubuntu 21.10 to ci

remove ubuntu 20.10

* forgot to update dockerfile

* add googletest from repos

* update downloaded gtest

ideally this should just grab the master version

* fix hash

* fix cmake issue
This commit is contained in:
ebbit1q 2021-10-31 03:15:50 +01:00 committed by GitHub
parent 656e3230de
commit 7712862036
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.ci/UbuntuGroovy/Dockerfile → .ci/UbuntuImpish/Dockerfile
View file

@ -1,4 +1,4 @@
FROM ubuntu:groovy FROM ubuntu:impish
RUN apt-get update && \ RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@ -17,7 +17,6 @@ RUN apt-get update && \
libqt5svg5-dev \ libqt5svg5-dev \
libqt5websockets5-dev \ libqt5websockets5-dev \
protobuf-compiler \ protobuf-compiler \
qt5-default \
qtmultimedia5-dev \ qtmultimedia5-dev \
qttools5-dev \ qttools5-dev \
qttools5-dev-tools \ qttools5-dev-tools \

4
.github/workflows/ci-builds.yml vendored
View file

@ -82,10 +82,10 @@ jobs:
matrix: matrix:
# these names correspond to the files in .ci/$distro # these names correspond to the files in .ci/$distro
include: include:
- distro: UbuntuHirsute - distro: UbuntuImpish
package: DEB package: DEB
- distro: UbuntuGroovy - distro: UbuntuHirsute
package: DEB package: DEB
test: skip test: skip

4
cmake/gtest-CMakeLists.txt.in
View file

@ -4,8 +4,8 @@ project(gtest-download LANGUAGES NONE)
include(ExternalProject) include(ExternalProject)
ExternalProject_Add(googletest ExternalProject_Add(googletest
URL https://github.com/google/googletest/archive/release-1.7.0.zip URL https://github.com/google/googletest/archive/release-1.11.0.zip
URL_HASH SHA1=f89bc9f55477df2fde082481e2d709bfafdb057b URL_HASH SHA1=9ffb7b5923f4a8fcdabf2f42c6540cce299f44c0
SOURCE_DIR "${CMAKE_BINARY_DIR}/gtest-src" SOURCE_DIR "${CMAKE_BINARY_DIR}/gtest-src"
BINARY_DIR "${CMAKE_BINARY_DIR}/gtest-build" BINARY_DIR "${CMAKE_BINARY_DIR}/gtest-build"
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""

2
tests/CMakeLists.txt
View file

@ -29,7 +29,7 @@ if(NOT GTEST_FOUND)
# Add the gtest include directory, since gtest # Add the gtest include directory, since gtest
# doesn't add that dependency to its gtest target # doesn't add that dependency to its gtest target
target_include_directories(gtest INTERFACE target_include_directories(gtest INTERFACE
"${CMAKE_BINARY_DIR}/gtest-src/include" ) "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/gtest-src/include>" )
SET(GTEST_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/gtest-src/include") SET(GTEST_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/gtest-src/include")
SET(GTEST_BOTH_LIBRARIES gtest) SET(GTEST_BOTH_LIBRARIES gtest)