-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Add serialization version to GameInfo * Add handling of incompatible saves due to a dfiferent save version * Fix compilation? * Fix ios compilation * Refactor: Make it clearer that GameInfo serialization version is only supposed to be incremented when it's guaranteed to cause issues & rename to compatibility version * Update initial version * Update initial version * Fix merge mistake
- Loading branch information
Showing
70 changed files
with
537 additions
and
360 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,100 +1,127 @@ | ||
|
|
||
| const { Octokit } = require("@octokit/rest"); | ||
| const { version } = require("os"); | ||
| const internal = require("stream"); | ||
| const fs = require("fs") | ||
| const {Octokit} = require("@octokit/rest"); | ||
| const fs = require("fs"); | ||
|
|
||
|
|
||
| // To be run from the main Unciv repo directory | ||
| // Summarizes and adds the summary to the changelog.md file | ||
| // Meant to be run from a Github action as part of the preparation for version rollout | ||
|
|
||
| async function main(){ | ||
| //region Executed Code | ||
| (async () => { | ||
| const nextVersion = await createChangeLog(); | ||
| const nextIncrementalVersion = updateBuildConfig(nextVersion); | ||
| updateGameVersion(nextVersion, nextIncrementalVersion); | ||
| })(); | ||
| //endregion | ||
|
|
||
| //region Function Definitions | ||
| async function createChangeLog() { | ||
| // no need to add auth: token since we're only reading from the commit list, which is public anyway | ||
| const octokit = new Octokit({}); | ||
|
|
||
|
|
||
| var result = await octokit.repos.listCommits({ | ||
| owner: "yairm210", | ||
| repo: "Unciv", | ||
| per_page: 50 }) | ||
|
|
||
| per_page: 50 | ||
| }); | ||
|
|
||
| var commitSummary = ""; | ||
| var ownerToCommits = {} | ||
| var reachedPreviousVersion = false | ||
| var nextVersionString = "" | ||
| var ownerToCommits = {}; | ||
| var reachedPreviousVersion = false; | ||
| var nextVersionString = ""; | ||
| result.data.forEach(commit => { | ||
| if (reachedPreviousVersion) return | ||
| var author = commit.author.login | ||
| if (author=="uncivbot[bot]") return | ||
| var commitMessage = commit.commit.message.split("\n")[0]; | ||
|
|
||
| var versionMatches = commitMessage.match(/^\d+\.\d+\.(\d+)$/) | ||
| if (versionMatches){ // match EXACT version, like 3.4.55 ^ is for start-of-line, $ for end-of-line | ||
| reachedPreviousVersion=true | ||
| var minorVersion = Number(versionMatches[1]) | ||
| console.log("Previous version: "+commitMessage) | ||
| nextVersionString = commitMessage.replace(RegExp(minorVersion+"$"), minorVersion+1 ) | ||
| console.log("Next version: " + nextVersionString) | ||
| return | ||
| } | ||
| if (commitMessage.startsWith("Merge ") || commitMessage.startsWith("Update ")) return | ||
| commitMessage = commitMessage.replace(/\(\#\d+\)/,"").replace(/\#\d+/,"") // match PR auto-text, like (#2345) or just #2345 | ||
| if (author != "yairm210"){ | ||
| if (ownerToCommits[author] == undefined) ownerToCommits[author]=[] | ||
| ownerToCommits[author].push(commitMessage) | ||
| if (reachedPreviousVersion) return; | ||
| var author = commit.author.login; | ||
| if (author === "uncivbot[bot]") return; | ||
| var commitMessage = commit.commit.message.split("\n")[0]; | ||
|
|
||
| var versionMatches = commitMessage.match(/^\d+\.\d+\.(\d+)$/); | ||
| if (versionMatches) { // match EXACT version, like 3.4.55 ^ is for start-of-line, $ for end-of-line | ||
| reachedPreviousVersion = true; | ||
| var minorVersion = Number(versionMatches[1]); | ||
| console.log("Previous version: " + commitMessage); | ||
| nextVersionString = commitMessage.replace(RegExp(minorVersion + "$"), minorVersion + 1); | ||
| console.log("Next version: " + nextVersionString); | ||
| return; | ||
| } | ||
| if (commitMessage.startsWith("Merge ") || commitMessage.startsWith("Update ")) return; | ||
| commitMessage = commitMessage.replace(/\(\#\d+\)/, "").replace(/\#\d+/, ""); // match PR auto-text, like (#2345) or just #2345 | ||
| if (author !== "yairm210") { | ||
| if (typeof ownerToCommits[author] === "undefined") ownerToCommits[author] = []; | ||
| ownerToCommits[author].push(commitMessage); | ||
| } else { | ||
| commitSummary += "\n\n" + commitMessage; | ||
| } | ||
| else commitSummary += "\n\n" + commitMessage | ||
| } | ||
| ); | ||
|
|
||
| Object.entries(ownerToCommits).forEach(entry => { | ||
| const [author, commits] = entry; | ||
| if (commits.length==1) commitSummary += "\n\n" + commits[0] + " - By "+author | ||
| else { | ||
| commitSummary += "\n\nBy "+author+":" | ||
| commits.forEach(commitMessage => { commitSummary += "\n- "+commitMessage }) | ||
| if (commits.length === 1) { | ||
| commitSummary += "\n\n" + commits[0] + " - By " + author; | ||
| } else { | ||
| commitSummary += "\n\nBy " + author + ":"; | ||
| commits.forEach(commitMessage => { commitSummary += "\n- " + commitMessage }); | ||
| } | ||
| }) | ||
| console.log(commitSummary) | ||
| console.log(commitSummary); | ||
|
|
||
| var textToAddToChangelog = "## "+ nextVersionString + commitSummary + "\n\n" | ||
| var textToAddToChangelog = "## " + nextVersionString + commitSummary + "\n\n"; | ||
|
|
||
| var changelogPath = 'changelog.md' | ||
| var currentChangelog = fs.readFileSync(changelogPath).toString() | ||
| if (!currentChangelog.startsWith(textToAddToChangelog)){ // minor idempotency - don't add twice | ||
| var newChangelog = textToAddToChangelog + currentChangelog | ||
| fs.writeFileSync(changelogPath, newChangelog) | ||
| var changelogPath = 'changelog.md'; | ||
| var currentChangelog = fs.readFileSync(changelogPath).toString(); | ||
| if (!currentChangelog.startsWith(textToAddToChangelog)) { // minor idempotency - don't add twice | ||
| var newChangelog = textToAddToChangelog + currentChangelog; | ||
| fs.writeFileSync(changelogPath, newChangelog); | ||
| } | ||
| return nextVersionString; | ||
| } | ||
|
|
||
| var buildConfigPath = "buildSrc/src/main/kotlin/BuildConfig.kt" | ||
| var buildConfigString = fs.readFileSync(buildConfigPath).toString() | ||
| function updateBuildConfig(nextVersionString) { | ||
| var buildConfigPath = "buildSrc/src/main/kotlin/BuildConfig.kt"; | ||
| var buildConfigString = fs.readFileSync(buildConfigPath).toString(); | ||
|
|
||
| console.log("Original: "+buildConfigString) | ||
| console.log("Original: " + buildConfigString); | ||
|
|
||
| // node.js string.match returns a regex string array, where array[0] is the entirety of the captured string, | ||
| // and array[1] is the first group, array[2] is the second group etc. | ||
| // Javascript string.match returns a regex string array, where array[0] is the entirety of the captured string, | ||
| // and array[1] is the first group, array[2] is the second group etc. | ||
|
|
||
| var appVersion = buildConfigString.match(/appVersion = "(.*)"/) | ||
| if (appVersion != nextVersionString){ | ||
| buildConfigString = buildConfigString.replace(appVersion[0], appVersion[0].replace(appVersion[1], nextVersionString)) | ||
| var androidVersion = buildConfigString.match(/appCodeNumber = (\d*)/) | ||
| console.log("Android version: "+androidVersion) | ||
| var nextAndroidVersion = Number(androidVersion[1]) + 1 | ||
| console.log("Next Android version: "+ nextAndroidVersion) | ||
| buildConfigString = buildConfigString.replace(androidVersion[0], | ||
| androidVersion[0].replace(androidVersion[1], nextAndroidVersion)) | ||
| var appVersionMatch = buildConfigString.match(/appVersion = "(.*)"/); | ||
| const curVersion = appVersionMatch[1]; | ||
| if (curVersion !== nextVersionString) { | ||
| buildConfigString = buildConfigString.replace(appVersionMatch[0], appVersionMatch[0].replace(curVersion, nextVersionString)); | ||
| var incrementalVersionMatch = buildConfigString.match(/appCodeNumber = (\d*)/); | ||
| let curIncrementalVersion = incrementalVersionMatch[1]; | ||
| console.log("Current incremental version: " + curIncrementalVersion); | ||
| const nextIncrementalVersion = Number(curIncrementalVersion) + 1; | ||
| console.log("Next incremental version: " + nextIncrementalVersion); | ||
| buildConfigString = buildConfigString.replace(incrementalVersionMatch[0], | ||
| incrementalVersionMatch[0].replace(curIncrementalVersion, nextIncrementalVersion)); | ||
|
|
||
| console.log("Final: "+buildConfigString) | ||
| fs.writeFileSync(buildConfigPath, buildConfigString) | ||
| console.log("Final: " + buildConfigString); | ||
| fs.writeFileSync(buildConfigPath, buildConfigString); | ||
|
|
||
| // A new, discrete changelog file for fastlane (F-Droid support): | ||
| var fastlaneChangelogPath = "fastlane/metadata/android/en-US/changelogs/" + nextAndroidVersion + ".txt" | ||
| fs.writeFileSync(fastlaneChangelogPath, textToAddToChangelog) | ||
| var fastlaneChangelogPath = "fastlane/metadata/android/en-US/changelogs/" + nextIncrementalVersion + ".txt"; | ||
| fs.writeFileSync(fastlaneChangelogPath, textToAddToChangelog); | ||
| return nextIncrementalVersion; | ||
| } | ||
| return appVersionMatch; | ||
| } | ||
|
|
||
| function updateGameVersion(nextVersion, nextIncrementalVersion) { | ||
| const gameInfoPath = "core/src/com/unciv/UncivGame.kt"; | ||
| const gameInfoSource = fs.readFileSync(gameInfoPath).toString(); | ||
| const regexp = /(\/\/region AUTOMATICALLY GENERATED VERSION DATA - DO NOT CHANGE THIS REGION, INCLUDING THIS COMMENT)[\s\S]*(\/\/endregion)/; | ||
| const withNewVersion = gameInfoSource.replace(regexp, function(match, grp1, grp2) { | ||
| const versionClassStr = createVersionClassString(nextVersion, nextIncrementalVersion); | ||
| return `${grp1}\n val VERSION = ${versionClassStr}\n ${grp2}`; | ||
| }) | ||
| fs.writeFileSync(gameInfoPath, withNewVersion); | ||
| } | ||
|
|
||
| function createVersionClassString(nextVersion, nextIncrementalVersion) { | ||
| return `Version("${nextVersion}", ${nextIncrementalVersion})`; | ||
| } | ||
|
|
||
| main() | ||
| //endregion |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.