Skip to content

Commit afb585e

Browse files
authored
Merge pull request #71 from Tormak9970/dev
Merging v2.0.0 into main
2 parents 305c467 + 365e8aa commit afb585e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+4665
-1199
lines changed

.github/workflows/custom-changelog/dist/index.cjs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,13 @@ const generateChangelog_1 = __nccwpck_require__(9937);
234234
const gitHelpers_1 = __nccwpck_require__(9601);
235235
const git = new gitHelpers_1.Git();
236236
function calcTrueNewVersionFromLog(currentVersion, changelog) {
237+
let isMajorChange = false;
237238
let numFixes = 0;
238239
let numFeats = 0;
239240
changelog.split("\n").forEach((logLine) => {
241+
if (logLine.includes("* feat: major release")) {
242+
isMajorChange = true;
243+
}
240244
if (logLine.includes("* feat:")) {
241245
numFeats++;
242246
}
@@ -246,7 +250,7 @@ function calcTrueNewVersionFromLog(currentVersion, changelog) {
246250
});
247251
let versions = currentVersion.split(".");
248252
let featsAdd = Math.ceil(numFeats / 10);
249-
return `${versions[0]}.${parseInt(versions[1]) + featsAdd}.${featsAdd == 0 ? parseInt(versions[2]) + Math.ceil(numFixes / 10) : 0}`;
253+
return `${isMajorChange ? parseInt(versions[0]) + 1 : versions[0]}.${!isMajorChange ? (parseInt(versions[1]) + featsAdd) : 0}.${(!isMajorChange && featsAdd == 0) ? (parseInt(versions[2]) + Math.ceil(numFixes / 10)) : 0}`;
250254
}
251255
function filterChangeLog(changelog) {
252256
let output = [];

.github/workflows/debug-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
uses: actions/checkout@v3
6060
with:
6161
fetch-depth: 0
62-
ref: release
62+
ref: "debug-release"
6363

6464
- name: Setup Node
6565
uses: actions/setup-node@v3

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Steam Art Manager
22
A tool for setting the artwork of your Steam library.
33

4-
![Steam Art Manager's Main UI](public/final-sarm-ui.png)
4+
![Steam Art Manager's Main UI](public/sarm-2.0.0-ui-final.png)
55

66
<br/>
77

index.html

Lines changed: 0 additions & 134 deletions
This file was deleted.

0 commit comments

Comments
 (0)