GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-19 00:43:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Use corrosion instead of CMakeRust (#3273)

Browse source 
* Use corrosion instead of CMakeRust
* use OpenSUSE tumbleweed (latest) to get newer CMake
This commit is contained in:
Dustin J. Mitchell 2024-03-02 16:21:34 -05:00 • committed by GitHub
parent 8dd29e0a8a
commit 18a8bd2997
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
47 changed files with 48 additions and 2786 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/CMakeLists.txt
View file

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.0)
cmake_minimum_required (VERSION 3.22)
# This is a work-around for the following CMake issue:
# https://gitlab.kitware.com/cmake/cmake/issues/16062
@ -29,7 +29,7 @@ add_custom_target (build_tests DEPENDS ${test_SRCS}
foreach (src_FILE ${test_SRCS})
add_executable (${src_FILE} "${src_FILE}.cpp" test.cpp)
target_link_libraries (${src_FILE} task tc commands columns libshared task tc tc-rust commands columns libshared task commands columns libshared ${TASK_LIBRARIES})
target_link_libraries (${src_FILE} task tc commands columns libshared task tc commands columns libshared task commands columns libshared ${TASK_LIBRARIES})
if (DARWIN)
target_link_libraries (${src_FILE} "-framework CoreFoundation -framework Security -framework SystemConfiguration")
endif (DARWIN)

5
test/docker/opensuse15
View file

@ -1,4 +1,7 @@
FROM opensuse/leap:15
FROM opensuse/tumbleweed
# NOTE: this isn't opensuse15 anymore, but this allows PRs to be merged by
# matching the GitHub configuration.
RUN zypper install -y python3 awk coreutils git gcc gcc-c++ cmake make libuuid-devel libfaketime curl

11
test/docker/ubuntu2004
View file

@ -1,7 +1,14 @@
FROM ubuntu:20.04
RUN apt-get update
RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y build-essential cmake git uuid-dev faketime locales python3 curl
RUN apt-get update && \
DEBIAN_FRONTEND="noninteractive" apt-get install -y gpg wget curl
# add Kitware's CMake apt repo
RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - > /usr/share/keyrings/kitware-archive-keyring.gpg && \
echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ focal main' > /etc/apt/sources.list.d/kitware.list
RUN apt-get update && \
DEBIAN_FRONTEND="noninteractive" apt-get install -y build-essential git uuid-dev faketime locales python3 cmake
# Setup language environment
RUN locale-gen en_US.UTF-8