Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update org.moneymanagerex.MMEX.metainfo.xml #6035

Merged
merged 6 commits into from
Jun 21, 2023
Merged

Update org.moneymanagerex.MMEX.metainfo.xml #6035

merged 6 commits into from
Jun 21, 2023

Conversation

ovari
Copy link
Contributor

@ovari ovari commented Jun 20, 2023

Please do not forget to update the mmex.pot file and write information about the fixed bug in the prerelease page.

https://github.com/moneymanagerex/moneymanagerex/releases/tag/v1.6.4

@joshua-stone is this all that is needed to update the version at https://github.com/flathub/org.moneymanagerex.MMEX?

Thank you


This change is Reviewable

@ovari
Copy link
Contributor Author

ovari commented Jun 20, 2023

@vomikan can you please merge? Thank you

@ovari
Copy link
Contributor Author

ovari commented Jun 20, 2023

Seems like a bot has done some work too at flathub/org.moneymanagerex.MMEX#6

@n-stein
Copy link
Contributor

n-stein commented Jun 21, 2023

I think you also need to remove cmakelists-3rd.patch from the FlatHub build. The file 3rd/cmakelists.txt was updated on moneymanagerex/master making this patch unnecessary. flathub/org.moneymanagerex.MMEX#6 is currently failing due to this.

@ovari
Copy link
Contributor Author

ovari commented Jun 21, 2023

I think you also need to remove cmakelists-3rd.patch from the FlatHub build. The file 3rd/cmakelists.txt was updated on moneymanagerex/master making this patch unnecessary. flathub/org.moneymanagerex.MMEX#6 is currently failing due to this.

@joshua-stone can you please fix this? Thank you

@ovari
Copy link
Contributor Author

ovari commented Jun 21, 2023

@n-stein does your comment mean that this patch is not necessary, i.e. can delete this merge request? Thank you

@joshua-stone
Copy link
Contributor

@ovari @n-stein I can fix this in the flatpak build, however please update the metainfo file before tagging a new release.

@joshua-stone
Copy link
Contributor

joshua-stone commented Jun 21, 2023

If you can, please merge the changes to this file, then tag a v1.6.4.1 or v1.6.5 release. Doing so will make it possible to not have to maintain two separate metainfo files:

https://github.com/flathub/org.moneymanagerex.MMEX/blob/master/org.moneymanagerex.MMEX.metainfo.xml
https://github.com/moneymanagerex/moneymanagerex/blob/master/resources/dist/linux/share/metainfo/org.moneymanagerex.MMEX.metainfo.xml

Ideally the metainfo file from upstream should be the only one used.

@ovari
Copy link
Contributor Author

ovari commented Jun 21, 2023

@joshua-stone does this patch tag the release so only one file is required?

If so, can @vomikan please merge?

Thank you

@ovari
Copy link
Contributor Author

ovari commented Jun 21, 2023

Updated this merge request to 1.6.4.1. Does the date need updating? Thank you

@ovari
Copy link
Contributor Author

ovari commented Jun 21, 2023

Don't know how to merge changes to remove cmakelists-3rd.patch

@ovari
Copy link
Contributor Author

ovari commented Jun 21, 2023

Is it strange that https://github.com/moneymanagerex/moneymanagerex/releases/ shows 1.6.3, not 1.6.4? Does @whalley need to tag for this to work? Thank you

@ovari
Copy link
Contributor Author

ovari commented Jun 21, 2023

Unlike https://github.com/moneymanagerex/moneymanagerex/releases/tag/v1.6.3, there are no executable files (only source code files) to download at https://github.com/moneymanagerex/moneymanagerex/releases/tag/v1.6.4

@joshua-stone
Copy link
Contributor

Tagging must be be done by a repo owner after this file is merged.

@vomikan @ovari Please make sure the version string in this file matches the latest tagged version.

Here is a test build:

flathub/org.moneymanagerex.MMEX#7

Because it's using the metainfo file in upstream MMEX, the latest version it will show is 1.6.3:

That's why it's important to ensure all version strings are updated at once before tagging a release.

@n-stein
Copy link
Contributor

n-stein commented Jun 21, 2023

there are no executable files (only source code files) to download at https://github.com/moneymanagerex/moneymanagerex/releases/tag/v1.6.4

@vomikan hasn't officially released 1.6.4. He updated cmakelists.txt, but has to wait for the next nightly Linux build at 03:30 UTC to have the non-beta 1.6.4 packages built.

So releases/latest still points to 1.6.3 until then.

@n-stein
Copy link
Contributor

n-stein commented Jun 21, 2023

@joshua-stone

please merge the changes to this file, then tag a v1.6.4.1 or v1.6.5 release

Is this necessary or are the changes you made in flathub/org.moneymanagerex.MMEX#7 sufficient?

@joshua-stone
Copy link
Contributor

@joshua-stone

please merge the changes to this file, then tag a v1.6.4.1 or v1.6.5 release

Is this necessary or are the changes you made in flathub/org.moneymanagerex.MMEX#7 sufficient?

Yes, merging this PR and then tagging a new release is necessary. The MMEX flatpak can now build without any patches, but now it relies on upstream to have accurate version strings.

@@ -342,17 +342,19 @@

<releases>

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@n-stein @vomikan This will need an entry for v1.6.4.1 or v1.6.5 as well before tagging a new release.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the date string need to be correct?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted version to 1.6.4.1

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The date string should reflect the day that you planned to release on, but there aren't strict requirements.

@n-stein
Copy link
Contributor

n-stein commented Jun 21, 2023

Would simply moving the 1.6.4 tag to the new commit cause an issue in FlatHub?

@ovari
Copy link
Contributor Author

ovari commented Jun 21, 2023

Is it better that this merge request be closed?

It feels like I'm making too much noise.

@joshua-stone
Copy link
Contributor

joshua-stone commented Jun 21, 2023

@n-stein Picking a specific commit instead of a tag is supported, so if you can't tag a new release in time then we can do that.

@ovari Please leave this MR open so we can resolve the underlying issue.

@ovari
Copy link
Contributor Author

ovari commented Jun 21, 2023

Picking a specific commit instead of a tag is supported, so if you can't tag a new release in time we can do that.

If understood correctly, tag should be 1.6.4

Please leave this MR open so we can resolve the underlying issue.

Can our fork be deleted and this remains?

Thank you

@joshua-stone
Copy link
Contributor

Picking a specific commit instead of a tag is supported, so if you can't tag a new release in time we can do that.

If understood correctly, tag should be 1.6.4

If the metainfo file was updated to reflect the version tag, then yes. However since it wasn't updated, that means the version displayed on Flathub will be incorrect. Therefore, we may have to use a specific commit instead.

Please leave this MR open so we can resolve the underlying issue.

Can our fork be deleted and this remains?

Thank you

Which fork are you referring to exactly?

@ovari
Copy link
Contributor Author

ovari commented Jun 21, 2023

Updated the time of release to 7 minutes ago UTC time based on https://github.com/moneymanagerex/moneymanagerex/releases/tag/v1.6.4

@ovari
Copy link
Contributor Author

ovari commented Jun 21, 2023

@vomikan can you please merge this?

@ovari
Copy link
Contributor Author

ovari commented Jun 21, 2023

Which fork are you referring to exactly?

https://github.com/ovari/moneymanagerex/

@vomikan vomikan merged commit 63f03cb into moneymanagerex:master Jun 21, 2023
2 checks passed
@joshua-stone
Copy link
Contributor

@vomikan @ovari @n-stein The MMEX flatpak has been updated to v1.6.4, however it had to do this by using a specific commit that has the updated version information:

https://github.com/flathub/org.moneymanagerex.MMEX/blob/c37b542c412a56321a08b575c4e1af870df23335/org.moneymanagerex.MMEX.yml#L65

The downside to this is that it cannot automatically pull in the latest stable tag, and someone will have to manually update the flatpak build manifest to point to a newer commit.

Please make sure to update the version string in org.moneymanagerex.MMEX.metainfo.xml before tagging a new release so that we can leverage build automation more effectively.

@whalley
Copy link
Member

whalley commented Jun 21, 2023

Obviously not ideal having to maintain build number detail in multiple places. Is there any better way to automate this.

@joshua-stone
Copy link
Contributor

joshua-stone commented Jun 22, 2023

@whalley appstreamcli can read a NEWS file and generate metainfo syntax.

For example, using file NEWS.md:

Version 1.6.4
~~~~~~~~~~~~~
Released: 2023-06-20

Version 1.6.3
~~~~~~~~~~~~~
Released: 2023-02-01

Features:
  * Last updated date time for transactions
  * Time Picker for GRM

Bugfixes:
  * Transactions color change
  * Filters do not take into account transactions where the categories are split
  * Void Transaction are considered in cashflow report (both daily, montly, and transaction)
  * Hidden subcategory is shown at the drop-down window
  * Transaction report incl sub categories fails duplicate reports
  * Recurring transactions - attachments are disappear
  * Deleted transactions should be excluded from Last Used date query
  * QIF ability to import/export field "E" of split lines notes
  * Forecast Report due to multiple currencies
  * Export as / Import from ... account menu
  * Edit Account images
  * ALT+letter button and menu accelerators also activate the transaction status accelerator actions
  * Сrash when all historical stock prices deleted
  * Quicken QIF import issue in split transactions with balnk row

Using appstremcli to read NEWS.md and org.moneymanagerex.MMEX.metainfo.xml.in (input metainfo file containing everything except release history) together to create org.moneymanagerex.MMEX.metainfo.xml

$ appstreamcli news-to-metainfo \
    --format=markdown \
    NEWS.md \
    resources/dist/linux/share/metainfo/org.moneymanagerex.MMEX.metainfo.xml.in \
    resources/dist/linux/share/metainfo/org.moneymanagerex.MMEX.metainfo.xml

The output file will contain release output looking like this:

  <releases>
    <release type="stable" version="1.6.4" date="2023-06-20T00:00:00Z"/>
    <release type="stable" version="1.6.3" date="2023-02-01T00:00:00Z">
      <description>
        <p>This release adds the following features:</p>
        <ul>
          <li>Last updated date time for transactions</li>
          <li>Time Picker for GRM</li>
        </ul>
        <p>This release fixes the following bugs:</p>
        <ul>
          <li>Transactions color change</li>
          <li>Filters do not take into account transactions where the categories are split</li>
          <li>Void Transaction are considered in cashflow report</li>
          <li>Hidden subcategory is shown at the drop-down window</li>
          <li>Transaction report incl sub categories fails duplicate reports</li>
          <li>Recurring transactions - attachments are disappear</li>
          <li>Deleted transactions should be excluded from Last Used date query</li>
          <li>QIF ability to import/export field "E" of split lines notes</li>
          <li>Forecast Report due to multiple currencies</li>
          <li>Export as / Import from ... account menu</li>
          <li>Edit Account images</li>
          <li>ALT+letter button and menu accelerators also activate the transaction status accelerator actions</li>
          <li>Сrash when all historical stock prices deleted</li>
          <li>Quicken QIF import issue in split transactions with balnk row</li>
        </ul>
      </description>
    </release>
  </releases>

I think it should be possible to have cmake generate the metainfo file so the process is seamless. At that point it's just a matter of making sure NEWS.md is up to date, which is generally useful anyway and gives you plenty of time to prepare release notes and act as a source of truth.

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.

None yet

5 participants