Upload Conan artifacts after install.

worldforge · Oct 27, 2023 · faa959d · faa959d
1 parent d0d0163
commit faa959d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -44,6 +44,10 @@ jobs:
         shell: bash
         run: |
           conan install tools/conan -pr default --build=missing --update
+          if [[ x"$CONAN_PASSWORD" != "x" && x"$CONAN_LOGIN_USERNAME" != "x" ]]; then
+            conan remote login worldforge $CONAN_LOGIN_USERNAME -p $CONAN_PASSWORD
+            conan upload "*" -r worldforge -c
+          fi
 
       - name: Configure CMake
         # Use a bash shell so we can use the same syntax for environment variable

diff --git a/src/squall/core/Generator.cpp b/src/squall/core/Generator.cpp
@@ -111,12 +111,12 @@ GenerateEntry Generator::processFile(const std::filesystem::path& filePath) {
 			auto fileLastWriteTime = std::filesystem::last_write_time(filePath);
 			if (existingI->second.lastWriteTime >= fileLastWriteTime) {
 				spdlog::trace("Last write time for file {} was the same ({}), marking as unchanged.", filePath.string(),
-							  std::chrono::clock_cast<std::chrono::system_clock>(fileLastWriteTime).time_since_epoch().count());
+							  fileLastWriteTime.time_since_epoch().count());
 				return {.fileEntry = existingI->second.fileEntry, .sourcePath=filePath, .repositoryPath=existingI->second.repositoryPath, .status = GenerateFileStatus::Existed};
 			} else {
 				spdlog::trace("Last write time for file {} ({}) differed from what was stored in the repo ({}), marking as changed.", filePath.string(),
-							  std::chrono::clock_cast<std::chrono::system_clock>(fileLastWriteTime).time_since_epoch().count(),
-							  std::chrono::clock_cast<std::chrono::system_clock>(existingI->second.lastWriteTime).time_since_epoch().count());
+							  fileLastWriteTime.time_since_epoch().count(),
+							  existingI->second.lastWriteTime.time_since_epoch().count());
 			}
 		}
 	}
@@ -137,12 +137,12 @@ GenerateEntry Generator::processDirectory(const std::filesystem::path& filePath,
 			auto fileLastWriteTime = std::filesystem::last_write_time(filePath);
 			if (existingI->second.lastWriteTime >= fileLastWriteTime) {
 				spdlog::trace("Last write time for directory {} was the same ({}), marking as unchanged.", filePath.string(),
-							  std::chrono::clock_cast<std::chrono::system_clock>(fileLastWriteTime).time_since_epoch().count());
+							  fileLastWriteTime.time_since_epoch().count());
 				return {.fileEntry = existingI->second.fileEntry, .sourcePath=filePath, .repositoryPath=existingI->second.repositoryPath, .status = GenerateFileStatus::Existed};
 			} else {
 				spdlog::trace("Last write time for directory {} ({}) differed from what was stored in the repo ({}), marking as changed.", filePath.string(),
-							  std::chrono::clock_cast<std::chrono::system_clock>(fileLastWriteTime).time_since_epoch().count(),
-							  std::chrono::clock_cast<std::chrono::system_clock>(existingI->second.lastWriteTime).time_since_epoch().count());
+							  fileLastWriteTime.time_since_epoch().count(),
+							  existingI->second.lastWriteTime.time_since_epoch().count());
 			}
 		}
 	}