From ff9a19381b682ec5722732164e1935bc54070959 Mon Sep 17 00:00:00 2001 From: Ryzerth Date: Wed, 23 Dec 2020 20:09:08 +0100 Subject: [PATCH] switch to more recent ubuntu version for CI --- .github/workflows/cmake.yml | 4 +--- core/src/gui/dialogs/credits.cpp | 6 +++--- core/src/gui/dialogs/loading_screen.cpp | 6 +++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 5d69cdb..ae316dd 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -5,8 +5,6 @@ on: [push] env: # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) BUILD_TYPE: Release - CC: gcc-8 - CXX: g++-8 jobs: build: @@ -14,7 +12,7 @@ jobs: # well on Windows or Mac. You can convert this to a matrix build if you need # cross-platform coverage. # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 diff --git a/core/src/gui/dialogs/credits.cpp b/core/src/gui/dialogs/credits.cpp index 3ebbdae..3f0abe6 100644 --- a/core/src/gui/dialogs/credits.cpp +++ b/core/src/gui/dialogs/credits.cpp @@ -33,19 +33,19 @@ namespace credits { ImGui::Text("Contributors"); for (int i = 0; i < sdrpp_credits::contributorCount; i++) { - ImGui::BulletText(sdrpp_credits::contributors[i]); + ImGui::BulletText("%s", sdrpp_credits::contributors[i]); } ImGui::NextColumn(); ImGui::Text("Libraries"); for (int i = 0; i < sdrpp_credits::libraryCount; i++) { - ImGui::BulletText(sdrpp_credits::libraries[i]); + ImGui::BulletText("%s", sdrpp_credits::libraries[i]); } ImGui::NextColumn(); ImGui::Text("Patrons"); for (int i = 0; i < sdrpp_credits::patronCount; i++) { - ImGui::BulletText(sdrpp_credits::patrons[i]); + ImGui::BulletText("%s", sdrpp_credits::patrons[i]); } ImGui::Columns(1, "CreditColumnsEnd", true); diff --git a/core/src/gui/dialogs/loading_screen.cpp b/core/src/gui/dialogs/loading_screen.cpp index 1ad7eaf..a616051 100644 --- a/core/src/gui/dialogs/loading_screen.cpp +++ b/core/src/gui/dialogs/loading_screen.cpp @@ -44,19 +44,19 @@ namespace LoadingScreen { ImGui::Text("Contributors"); for (int i = 0; i < sdrpp_credits::contributorCount; i++) { - ImGui::BulletText(sdrpp_credits::contributors[i]); + ImGui::BulletText("%s", sdrpp_credits::contributors[i]); } ImGui::NextColumn(); ImGui::Text("Libraries"); for (int i = 0; i < sdrpp_credits::libraryCount; i++) { - ImGui::BulletText(sdrpp_credits::libraries[i]); + ImGui::BulletText("%s", sdrpp_credits::libraries[i]); } ImGui::NextColumn(); ImGui::Text("Patrons"); for (int i = 0; i < sdrpp_credits::patronCount; i++) { - ImGui::BulletText(sdrpp_credits::patrons[i]); + ImGui::BulletText("%s", sdrpp_credits::patrons[i]); } ImGui::Columns(1, "CreditColumnsEnd", true);