mirror of
https://github.com/EDCD/EDMarketConnector.git
synced 2025-04-22 20:00:29 +03:00
Merge branch 'main' into develop
This commit is contained in:
Athanasius
commit
ad642f2849
@ -1,6 +1,12 @@
|
||||
This is the master changelog for Elite Dangerous Market Connector. Entries are in reverse chronological order (latest first).
|
||||
---
|
||||
|
||||
Release 4.0.2.0
|
||||
===
|
||||
Only a minor fix to EDMC.exe
|
||||
|
||||
* Restore the reporting of new releases for `EDMC.exe -v`.
|
||||
|
||||
Release 4.0.1.0
|
||||
===
|
||||
This fixes a bug with the EDDB 'System Provider' URLs.
|
||||
|
||||
@ -37,13 +37,19 @@ Git branch structure and tag conventions
|
||||
---
|
||||
Somewhat based on git-flow, but our particular take on it:
|
||||
|
||||
* `stable` - The HEAD of this Branch should always point to the code that was used in the last released stable version.
|
||||
### Branches
|
||||
* `stable` - This will either have `HEAD` pointing to the latest stable
|
||||
release code *or* might have extra code merged in for a hotfix that will
|
||||
shortly be in the next stable release. If you want the latest stable release
|
||||
code then use the appropriate `Release/A.B.C.D` tag!
|
||||
|
||||
* `beta` - If we run any pre-release betas *with actual builds released, not
|
||||
just a branch to be run from source*, then the HEAD of this Branch should
|
||||
always point to the code that was used in the last beta version. *This means
|
||||
that if there hasn't yet been a new beta version this could be far behind
|
||||
all of: main, develop, stable.*
|
||||
just a branch to be run from source*, then this branch will contain that
|
||||
code. As per `stable` above, this branch might be ahead of the latest
|
||||
pre-release due to merging of hotfixes. Use the appropriate tag if you want
|
||||
to be sure of the code you checkout.
|
||||
*If there hasn't yet been a new beta version this could be far behind all
|
||||
of: `main`, `develop`, `stable`.*
|
||||
|
||||
* `develop` - This is the branch where all current development is integrated. No commits should be made directly
|
||||
to this as the work should be done in a separate branch used in a Pull Request before being merged as part of
|
||||
@ -64,6 +70,23 @@ but some care will be necessary to ensure no users are left behind (their client
|
||||
then no longer exists). For the time being this should always be kept in sync with `stable` as each new release is
|
||||
made.
|
||||
|
||||
### Tags
|
||||
|
||||
#### Stable Releases
|
||||
All stable releases **MUST** had a tag of the form `Release/A.B.C.D` on the
|
||||
commit that was `HEAD` when the installer for it was built.
|
||||
|
||||
#### Pre-Releases
|
||||
Currently the tags for pre-releases are of the same form as those for stable
|
||||
releases. This will change in the future when the project for [full semantic
|
||||
versioning](https://github.com/EDCD/EDMarketConnector/projects/4) is completed.
|
||||
|
||||
This does mean that some care should be taken. If the current stable
|
||||
release is `4.0.1.0` then you should 'guess' at the pre-release version
|
||||
needing to be either `4.1.0.0` or `5.0.0.0` depending on what has changed.
|
||||
|
||||
---
|
||||
|
||||
Work in progress conventions
|
||||
---
|
||||
Remember, you should always be working versus a single issue, even if the work is part of a Milestone or Project.
|
||||
|
||||
7
EDMC.py
7
EDMC.py
@ -71,11 +71,14 @@ try:
|
||||
item.find('title').text) for item in feed.findall('channel/item')])
|
||||
lastversion = sorted(items, key=versioncmp)[-1]
|
||||
if versioncmp(lastversion) > versioncmp(appversion):
|
||||
latest = ' (%s is available)' % items[lastversion]
|
||||
latest = items[lastversion]
|
||||
except Exception as e:
|
||||
sys.stderr.write('Exception in version check: {}'.format(str(e)))
|
||||
#pass # Quietly suppress timeouts etc.
|
||||
print(appversion)
|
||||
if latest:
|
||||
print('{CURRENT} ({UPDATE} is available)'.format(CURRENT=appversion, UPDATE=latest))
|
||||
else:
|
||||
print(appversion)
|
||||
sys.exit(EXIT_SUCCESS)
|
||||
|
||||
if args.j:
|
||||
|
||||
@ -8,7 +8,7 @@ from sys import platform
|
||||
appname = 'EDMarketConnector'
|
||||
applongname = 'E:D Market Connector'
|
||||
appcmdname = 'EDMC'
|
||||
appversion = '4.0.1.0'
|
||||
appversion = '4.0.2.0'
|
||||
copyright = u'© 2015-2019 Jonathan Harris, 2020 EDCD'
|
||||
|
||||
update_feed = 'https://raw.githubusercontent.com/EDCD/EDMarketConnector/releases/edmarketconnector.xml'
|
||||
|
||||
@ -168,11 +168,17 @@
|
||||
<!-- Windows -->
|
||||
|
||||
<item>
|
||||
<title>Release 4.0.1.0</title>
|
||||
<title>Release 4.0.2.0</title>
|
||||
<description>
|
||||
<![CDATA[
|
||||
<style>body { font-family:"Segoe UI","Tahoma"; font-size: 75%; } h2 { font-family:"Segoe UI","Tahoma"; font-size: 105%; }</style>
|
||||
|
||||
<h2>Release 4.0.2.0</h2>
|
||||
<p>Only a minor fix to EDMC.exe</p>
|
||||
<ul>
|
||||
<li>Restore the reporting of new releases for <code>EDMC.exe -v</code>.</li>
|
||||
</ul>
|
||||
|
||||
<h2>Release 4.0.1.0</h2>
|
||||
<p>This fixes a bug with the EDDB 'System Provider' URLs.</p>
|
||||
<ul>
|
||||
@ -490,11 +496,11 @@ If any of your plugins are listed in that section then they will need updating,
|
||||
]]>
|
||||
</description>
|
||||
<enclosure
|
||||
url="https://github.com/EDCD/EDMarketConnector/releases/download/Release/4.0.1.0/EDMarketConnector_win_4.0.1.0.msi"
|
||||
url="https://github.com/EDCD/EDMarketConnector/releases/download/Release/4.0.2.0/EDMarketConnector_win_4.0.2.0.msi"
|
||||
sparkle:os="windows"
|
||||
sparkle:installerArguments="/passive LAUNCH=yes"
|
||||
sparkle:version="4.0.1.0"
|
||||
length="11313152"
|
||||
sparkle:version="4.0.2.0"
|
||||
length="11309056"
|
||||
type="application/octet-stream"
|
||||
/>
|
||||
</item>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user