Skip to content

Update MerlinAU.sh#104

Merged
ExtremeFiretop merged 1 commit intoExtremeFiretop:devfrom
Martinski4GitHub:dev
Jan 29, 2024
Merged

Update MerlinAU.sh#104
ExtremeFiretop merged 1 commit intoExtremeFiretop:devfrom
Martinski4GitHub:dev

Conversation

@Martinski4GitHub
Copy link
Collaborator

Improved the code that removes the "Alpha/Beta" suffixes from the version string.
I was testing the "Beta-to-Production" option and by chance set the Beta version like this:

"3004.386.12.4.Beta1"

Which gave this string: "3004.386.12.4."

So I added possible separators for the "Beta" suffix. Now the resulting value is as expected:

"3004.386.12.4Beta1" ==> "3004.386.12.4"
"3004.386.12.4.Beta1" ==> "3004.386.12.4"
"3004.386.12.4_Beta1" ==> "3004.386.12.4"
"3004.386.12.4-Beta1" ==> "3004.386.12.4"

Improved the code that removes the "Alpha/Beta" suffixes from the version string.
@ExtremeFiretop ExtremeFiretop merged commit 96b2e08 into ExtremeFiretop:dev Jan 29, 2024
@ExtremeFiretop
Copy link
Owner

Testing now

@ExtremeFiretop
Copy link
Owner

ExtremeFiretop commented Jan 29, 2024

Morning @Martinski4GitHub

Works as intended, however using the following format: 3004.386.12.4.Beta1 (outside the standard) in the debug mode breaks the changelog verification:

Not sure if that's something we need to address next.

@ExtremeFiretop
Copy link
Owner

Morning @Martinski4GitHub

Works as intended, however using the following format: 3004.386.12.4.Beta1 (outside the standard) in the debug mode breaks the changelog verification:

Not sure if that's something we need to address next.

Seems to me that the reason is the matching becomes broken, it currently searchs the file for the startpoint using the standard format (3004.388.6) and then the end by searching for the next point following that format, and then parses that chunk between the 2 points.

But 3004.386.12.4.Beta1 (or 3004.386.12.4) for that matter, does not match the format we are looking for in the changelogs and due to that, checks the entire change log.

@ExtremeFiretop
Copy link
Owner

I see 2 routes to the above problem, one is we simply disable changelog verification if those 2 points aren't found, or we try to adapt the matching so it can find formats such as: "3004.386.12.4"

I'm pretty sure (like 80% sure) my current solution would not match that format correctly now even if was in the file.

@Martinski4GitHub
Copy link
Collaborator Author

Martinski4GitHub commented Jan 30, 2024

I see 2 routes to the above problem, one is we simply disable changelog verification if those 2 points aren't found, or we try to adapt the matching so it can find formats such as: "3004.386.12.4"

I'm pretty sure (like 80% sure) my current solution would not match that format correctly now even if was in the file.

I think you have to adjust your logic to account for two different version formats used in the changelogs:

For 386 F/W:
ChangeLog Actual F/W Version
======== ============
386.12_2 ------> "3004.386.12.2"
386.12 --------> "3004.386.12.0"

For 388 F/W:
ChangeLog Actual F/W Version
======== ============
3004.388.6_1 ------> "3004.388.6.1"
3004.388.6 --------> "3004.388.6.0"

@ExtremeFiretop
Copy link
Owner

aren't found, or we try to adapt the matching so it can find formats such as: "3004.386.12.4"

I'm pretty sure (like 80% sure) my current solution would not match that format correctly now even if was in the file.

Agreed, I didn't sleep last night at all really, so just starting to look into this now LOL.
But I agree, I actually like both routes described.

1 is adjust the logic for the formats, and if after adjusting the logic for multiple formats still doesn't find it, then we just flat out disable it so people aren't confused.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants