From fea7b1dbb5175c66d9aab7fb7488cb9e8e8010f0 Mon Sep 17 00:00:00 2001 From: Mark van Renswoude Date: Thu, 4 Jan 2018 22:56:12 +0100 Subject: [PATCH] Removed the GitVersion Sha as it was impossible to commit --- gulpfile.js | 1 - src/assets/version.h | 5 ++--- src/server/settings.cpp | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 5d99ce7..c7b95c0 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -210,7 +210,6 @@ gulp.task('embedVersion', function(cb) headerFile += "const uint8_t VersionMetadata = " + version.BuildMetaData + ";\r\n"; headerFile += "const char VersionBranch[] = \"" + version.BranchName + "\";\r\n"; - headerFile += "const char VersionSha[] = \"" + version.Sha + "\";\r\n"; headerFile += "const char VersionSemVer[] = \"" + version.SemVer + "\";\r\n"; headerFile += "const char VersionFullSemVer[] = \"" + version.FullSemVer + "\";\r\n"; diff --git a/src/assets/version.h b/src/assets/version.h index baad0ab..470368b 100644 --- a/src/assets/version.h +++ b/src/assets/version.h @@ -4,11 +4,10 @@ const uint8_t VersionMajor = 2; const uint8_t VersionMinor = 0; const uint8_t VersionPatch = 0; -const uint8_t VersionMetadata = 4; +const uint8_t VersionMetadata = 5; const char VersionBranch[] = "release/2.0"; -const char VersionSha[] = "176fa2a7bae0e9604a70c69da27b68819b479b73"; const char VersionSemVer[] = "2.0.0-beta.1"; -const char VersionFullSemVer[] = "2.0.0-beta.1+4"; +const char VersionFullSemVer[] = "2.0.0-beta.1+5"; const char VersionCommitDate[] = "2018-01-04"; #endif diff --git a/src/server/settings.cpp b/src/server/settings.cpp index 4b0089b..a7917b7 100644 --- a/src/server/settings.cpp +++ b/src/server/settings.cpp @@ -23,7 +23,7 @@ void handleVersion(AsyncWebServerRequest *request) JsonObject& root = jsonBuffer.createObject(); root["systemID"] = String(ESP.getChipId(), HEX); - root["version"] = String(VersionFullSemVer) + " sha." + String(VersionSha); + root["version"] = String(VersionFullSemVer); AsyncResponseStream *response = request->beginResponseStream("application/json"); root.printTo(*response);