Squashed commit of the following:

commit 532c50a Author: Nick Logozzo <[email protected]> Date: Thu Dec 7 08:16:20 2023 -0500 glibc 2.35 commit f21d976 Author: Nick Logozzo <[email protected]> Date: Thu Dec 7 07:56:06 2023 -0500 Update build.yml commit df5031a Author: Nick Logozzo <[email protected]> Date: Thu Dec 7 07:54:30 2023 -0500 Conan Settings For Custom glibc commit 6f901b1 Author: Nick Logozzo <[email protected]> Date: Thu Dec 7 07:41:36 2023 -0500 Fix glib build commit 443489f Author: Nick Logozzo <[email protected]> Date: Thu Dec 7 07:36:23 2023 -0500 Update build.yml commit 9709056 Author: Nick Logozzo <[email protected]> Date: Thu Dec 7 07:33:14 2023 -0500 Update build.yml commit 830ae0f Author: Nick Logozzo <[email protected]> Date: Thu Dec 7 07:32:58 2023 -0500 Update build.yml commit f0f13eb Author: Nick Logozzo <[email protected]> Date: Thu Dec 7 07:32:19 2023 -0500 Update build.yml commit 8c63067 Author: Nick Logozzo <[email protected]> Date: Thu Dec 7 07:29:22 2023 -0500 Update build.yml commit f39d592 Author: Nick Logozzo <[email protected]> Date: Thu Dec 7 07:25:04 2023 -0500 Update build.yml commit 134a893 Author: Nick Logozzo <[email protected]> Date: Thu Dec 7 07:22:33 2023 -0500 Build glib from source commit fcaeb0b Author: Nick Logozzo <[email protected]> Date: Thu Dec 7 07:07:57 2023 -0500 Build glib from source
NickvisionApps · Dec 7, 2023 · 96853c6 · 96853c6
1 parent ce5a0bf
commit 96853c6
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -34,11 +34,16 @@ jobs:
       fail-fast: false
     steps:
       - name: "Checkout"  
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v4
         with:
           submodules: recursive
       - name: "Get Conan"
         uses: turtlebrowser/get-conan@main
+      - name: "Setup Conan Settings (Linux)"
+        if: ${{ matrix.config.os == 'ubuntu-latest'}}
+        run: |
+          mv conansettings.yml settings_user.yml
+          conan config install settings_user.yml
       - name: "Install Conan"
         run: conan install ${{matrix.config.conan-file}} --profile:host=${{matrix.config.conan-profile}} --profile:build=${{matrix.config.conan-profile}} -s compiler.cppstd=20 --build=missing
       - name: "CMake Build (Linux)"

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -52,7 +52,6 @@ find_package(maddy REQUIRED)
 find_package(SQLiteCpp REQUIRED)
 target_link_libraries(${PROJECT_NAME} PUBLIC Intl::Intl JsonCpp::JsonCpp CURL::libcurl maddy::maddy SQLiteCpp)
 if(LINUX)
-	set(CMAKE_REQUIRED_LIBRARIES resolv)
 	find_package(PkgConfig REQUIRED)
 	find_package(libsecret REQUIRED CONFIG)
 	find_package(libuuid REQUIRED CONFIG)
@@ -76,6 +75,7 @@ enable_testing()
 add_executable(${PROJECT_NAME}_test
 	tests/eventtests.cpp
 	tests/main.cpp
+	tests/networktests.cpp
 	tests/stringtests.cpp
 	tests/versiontests.cpp
 	tests/webtests.cpp)

diff --git a/conanfile-linux.txt b/conanfile-linux.txt
@@ -5,9 +5,9 @@ libcurl/8.4.0
 maddy/1.3.0
 sqlcipher/4.5.1
 sqlitecpp/3.3.1
+glib/2.78.1
 libsecret/0.20.5
 libuuid/1.0.3
-glib/2.78.1
 gtest/1.14.0
 
 [generators]

diff --git a/conanprofile-linux.txt b/conanprofile-linux.txt
@@ -5,4 +5,6 @@ compiler=gcc
 compiler.cppstd=gnu20
 compiler.libcxx=libstdc++11
 compiler.version=11
-os=Linux
+os=Linux
+os.libc=glibc
+os.libc.version=2.35
diff --git a/conansettings.yml b/conansettings.yml
@@ -0,0 +1,6 @@
+os:
+    Linux:
+        libc:
+            null:
+            glibc:
+                version: ["2.35", "2.36", "2.37", "2.38"]