diff --git a/Home.md b/Home.md index 0c3915e..a4d4495 100644 --- a/Home.md +++ b/Home.md @@ -1,14 +1,14 @@ -| Name | Links | Fork, active branch | Version | PR link | PR status | Notes | -|-------------------------|--------------------------------------------------------------------|---------------------|------------|------------|--------------------------|-------| -| amarillo | [GI][1g] [GH][1m] πŸ”΄[CI][1j] πŸ”΄[GHA][1a] πŸ”΄[PyPI][1] πŸ”΄[GIcr][1r] 🟑[ghcr][1d] | [Link][1f] dev | πŸ”΄0.0.17a1 | [Link][1p] | Merged into plugins bran | [^1] | -| amarillo-gtfs-generator | [GI][2g] [GH][2m] 🟑[CI][2j] 🟑[PyPI][1] πŸ”΄Docker πŸ”΄ghcr | | 🟒2.0.0 | | | [^2] | -| amarillo-enhancer | [GI][3g] [GH][3m] 🟒[CI][3j] 🟒[PyPI][1] 🟒[Docker][3d] πŸ”΄ghcr | | 🟒2.0.0 | | | [^3] | -| amarillo-compose | [GI][4g] [GH][4m] | | 🟒2.0.0 | | | [^4] | -| amarillo-gtfs-exporter | [GI][5g] [GH][5m] 🟒[PyPI][5p] | | 🟒2.0.0 | | | [^5] | -| amarillo-metrics | [GI][6g] [GH][6m] 🟑[CI][6j] 🟑[PyPI][6p] | | 🟒2.0.0 | | | [^6] | -| amarillo-stops | [GH][7m] 🟑[CI][7j] 🟒[PyPI][7p] | | 🟒2.0.0 | | | [^7] | -| amarillo-grfs-export | [GI][8g] GH [PyPI][1] | | | | | [^8] | +| Name | Links | Fork, active branch | Version | PR link | PR status | Notes | +|-------------------------|---------------------------------------------------------------------------------------------|---------------------|------------|------------|--------------------------|-------| +| amarillo | [GI][1g] [GH][1m] πŸ”΄[CI][1j] πŸ”΄[GHA][1a] πŸ”΄[GIPy][1x] πŸ”΄[Pypi][1] πŸ”΄[GIcr][1r] 🟑[ghcr][1d] | [Link][1f] dev | πŸ”΄0.0.17a1 | [Link][1p] | Merged into plugins bran | [^1] | +| amarillo-gtfs-generator | [GI][2g] [GH][2m] 🟑[CI][2j] 🟑[PyPI][1] πŸ”΄Docker πŸ”΄ghcr | | 🟒2.0.0 | | | [^2] | +| amarillo-enhancer | [GI][3g] [GH][3m] 🟒[CI][3j] 🟒[PyPI][1] 🟒[Docker][3d] πŸ”΄ghcr | | 🟒2.0.0 | | | [^3] | +| amarillo-compose | [GI][4g] [GH][4m] | | 🟒2.0.0 | | | [^4] | +| amarillo-gtfs-exporter | [GI][5g] [GH][5m] 🟒[PyPI][5p] | | 🟒2.0.0 | | | [^5] | +| amarillo-metrics | [GI][6g] [GH][6m] 🟑[CI][6j] 🟑[PyPI][6p] | | 🟒2.0.0 | | | [^6] | +| amarillo-stops | [GH][7m] 🟑[CI][7j] 🟒[PyPI][7p] | | 🟒2.0.0 | | | [^7] | +| amarillo-grfs-export | [GI][8g] GH [PyPI][1] | | | | | [^8] | [^1]: New PR: Call to enhancer, base and derived images, carpool event hooks βœ“
CI/CD: missing publishing to PyPI
@@ -33,6 +33,8 @@ [1m]: https://github.com/mfdz/amarillo [1p]: https://github.com/mfdz/amarillo/pull/34 [1r]: https://git.gerhardt.io/amarillo/-/packages/container/amarillo/latest +[1x]: https://git.gerhardt.io/amarillo/-/packages/pypi/amarillo-core + [2g]: https://git.gerhardt.io/amarillo/amarillo-gtfs-generator [2f]: https://github.com/frsaba/amarillo-gtfs-generator [2j]: https://jenkins.gerhardt.io/job/Amarillo/job/amarillo-github/job/amarillo-gtfs-generator/ @@ -71,3 +73,13 @@ Release process - manual 2. get the PyPI link after Jenkins has published the package, e.g. https://pypi.org/project/amarillo-stops/2.0.1/ 3. on GH create new release, use above tag, name "vx.y.z", in description put the PyPI link (sources.zip is added automatically) +Release branch on amarillo: needed? + +Version number for non-releases +- version number is taken from pyproject.toml +- if branch==main + then use the version as is + else append -devHASH +- v2.0.0.-devNNN, **use v2.0.0-dev5ec367f** 7 chars + +**Note**: we must make sure that only trusted PRs get deployed, because anybody can make a PR