From eb032863fb15bcdf826f6d4d8e021605506427e8 Mon Sep 17 00:00:00 2001 From: Luke Street Date: Mon, 29 Mar 2021 18:32:55 -0400 Subject: [PATCH] CI: Checkout with fetch-depth: 0 --- .github/workflows/build.yml | 4 ++++ Editor/ProjectManager.cpp | 5 +++-- Editor/SplashScreen.cpp | 2 +- Editor/ViewManager.cpp | 2 +- version.h.in | 15 ++++++++------- 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3b9615881..37f7a3008 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,6 +27,7 @@ jobs: steps: - uses: actions/checkout@v2 with: + fetch-depth: 0 submodules: recursive - name: Install dependencies @@ -75,6 +76,7 @@ jobs: steps: - uses: actions/checkout@v2 with: + fetch-depth: 0 submodules: recursive - name: Install dependencies @@ -131,6 +133,7 @@ jobs: steps: - uses: actions/checkout@v2 with: + fetch-depth: 0 submodules: recursive - name: Install LLVM @@ -191,6 +194,7 @@ jobs: steps: - uses: actions/checkout@v2 with: + fetch-depth: 0 submodules: recursive - name: Install LLVM diff --git a/Editor/ProjectManager.cpp b/Editor/ProjectManager.cpp index cbcc6779f..75ec33ba9 100644 --- a/Editor/ProjectManager.cpp +++ b/Editor/ProjectManager.cpp @@ -65,7 +65,7 @@ bool ProjectManager::newProject(hecl::SystemStringView path) { saveProject(); m_vm.m_mainWindow->setTitle(fmt::format(FMT_STRING(_SYS_STR("{} - URDE {} [{}]")), - m_proj->getProjectRootPath().getLastComponent(), URDE_WC_DESCRIBE, m_vm.platformName())); + m_proj->getProjectRootPath().getLastComponent(), URDE_WC_DESCRIBE_SYS, m_vm.platformName())); m_vm.DismissSplash(); m_vm.FadeInEditors(); @@ -105,7 +105,8 @@ bool ProjectManager::openProject(hecl::SystemStringView path) { saveProject(); m_vm.m_mainWindow->setTitle(fmt::format(FMT_STRING(_SYS_STR("{} - URDE {} [{}]")), - m_proj->getProjectRootPath().getLastComponent(), URDE_WC_DESCRIBE, m_vm.platformName())); + m_proj->getProjectRootPath().getLastComponent(), URDE_WC_DESCRIBE_SYS, + m_vm.platformName())); m_vm.DismissSplash(); m_vm.FadeInEditors(); m_vm.pushRecentProject(m_proj->getProjectRootPath().getAbsolutePath()); diff --git a/Editor/SplashScreen.cpp b/Editor/SplashScreen.cpp index c3546fb72..fe997ecb2 100644 --- a/Editor/SplashScreen.cpp +++ b/Editor/SplashScreen.cpp @@ -34,7 +34,7 @@ SplashScreen::SplashScreen(ViewManager& vm, specter::ViewResources& res) , m_openProjBind(*this) , m_extractProjBind(*this) { if (URDE_WC_DATE[0] != '\0' && URDE_WC_REVISION[0] != '\0' && URDE_WC_BRANCH[0] != '\0') { - m_buildInfoStr = fmt::format(FMT_STRING("{}: {}\n{}: {}\n{}: {}"), + m_buildInfoStr = fmt::format(FMT_STRING("{}: {}\n{}: {}\n{}: {}"), vm.translate(), URDE_WC_DESCRIBE, vm.translate(), URDE_WC_BRANCH, vm.translate(), URDE_WC_REVISION/*, diff --git a/Editor/ViewManager.cpp b/Editor/ViewManager.cpp index 0df4f499c..fd36e8d50 100644 --- a/Editor/ViewManager.cpp +++ b/Editor/ViewManager.cpp @@ -299,7 +299,7 @@ void ViewManager::init(boo::IApplication* app) { m_pipelineConv = hecl::NewPipelineConverter(m_mainBooFactory); hecl::conv = m_pipelineConv.get(); m_mainPlatformName = m_mainBooFactory->platformName(); - m_mainWindow->setTitle(fmt::format(FMT_STRING(_SYS_STR("URDE {} [{}]")), URDE_WC_DESCRIBE, m_mainPlatformName)); + m_mainWindow->setTitle(fmt::format(FMT_STRING(_SYS_STR("URDE {} [{}]")), URDE_WC_DESCRIBE_SYS, m_mainPlatformName)); m_mainCommandQueue = m_mainWindow->getCommandQueue(); m_viewResources.init(m_mainBooFactory, &m_fontCache, &m_themeData, pixelFactor); InitializeIcons(m_viewResources); diff --git a/version.h.in b/version.h.in index 866d3908a..b9e64fe75 100644 --- a/version.h.in +++ b/version.h.in @@ -9,17 +9,18 @@ #endif #endif -#define URDE_WC_DESCRIBE _SYS_STR("@URDE_WC_DESCRIBE@") -#define URDE_VERSION_STRING _SYS_STR("@URDE_VERISON_STRING@") +#define URDE_WC_DESCRIBE "@URDE_WC_DESCRIBE@" +#define URDE_WC_DESCRIBE_SYS _SYS_STR("@URDE_WC_DESCRIBE@") +#define URDE_VERSION_STRING "@URDE_VERISON_STRING@" -#define URDE_WC_BRANCH _SYS_STR("@URDE_WC_BRANCH@") -#define URDE_WC_REVISION _SYS_STR("@URDE_WC_REVISION@") -#define URDE_WC_DATE _SYS_STR("@URDE_WC_DATE@") +#define URDE_WC_BRANCH "@URDE_WC_BRANCH@" +#define URDE_WC_REVISION "@URDE_WC_REVISION@" +#define URDE_WC_DATE "@URDE_WC_DATE@" #if defined(__x86_64__) || defined(_M_AMD64) -#define URDE_DLPACKAGE _SYS_STR("urde-@URDE_WC_DESCRIBE@-@PLATFORM_NAME@-x86_64-@URDE_VECTOR_ISA@") +#define URDE_DLPACKAGE "urde-@URDE_WC_DESCRIBE@-@PLATFORM_NAME@-x86_64-@URDE_VECTOR_ISA@" #elif defined(__aarch64__) || defined(_M_ARM64) -#define URDE_DLPACKAGE _SYS_STR("urde-@URDE_WC_DESCRIBE@-@PLATFORM_NAME@-arm64") +#define URDE_DLPACKAGE "urde-@URDE_WC_DESCRIBE@-@PLATFORM_NAME@-arm64" #endif #endif