From 78a962486a5edba92ab42ed4a0137a8432643fd3 Mon Sep 17 00:00:00 2001 From: Frank Date: Fri, 2 Aug 2024 11:51:37 +0200 Subject: [PATCH] Update Home --- Home.md | 63 ++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 51 insertions(+), 12 deletions(-) diff --git a/Home.md b/Home.md index d279c72..80f795d 100644 --- a/Home.md +++ b/Home.md @@ -1,13 +1,14 @@ - | | GI repo | Fork | Active branch | Version | | Github | PR status | Notes --- | -- | -- | -- | -- | -- | -- | -- | -- | -- -amarillo | Link | Link | dev | 0.0.17a1 | Link | Link | Merged into plugins branch; PR is for merging to main | [^1] -amarillo-gtfs-generator | Link | Link | main | 0.0.2 | Link | Link | Not merged | [^2] -amarillo-enhancer | Link | Link | fastapi | 0.0.5 | Link | Link | Conflicts, fixed locally | [^3] -amarillo-compose | Link | Link | dev | - | Link | Link | Not merged | [^4] -amarillo-gtfs-exporter | Link | Link | separate-generator | 0.0.4 | Link | - | Not merged |[^5] -amarillo-metrics | Link | Link | main | 0.0.6 | Link | Link | Readme PR not merged; Carpool metrics are in fork on a separate branch ✓ | [^6] -amarillo-stops | - | - | | 0.0.1 | | Link | - | [^7] -amarillo-grfs-export | Link | - | | | | - | - | [^8] + +| | GI repo | Fork | Active branch | Version | Github | GH Release | PR link | PR status | Notes | +|-------------------------|------------|------------|--------------------|-------------|------------|-------------------|------------|--------------------------|-------| +| amarillo | [Link][1g] | [Link][1f] | dev | 🔴 0.0.17a1 | [Link][1m] | 🔴 Image [PyPI][] | [Link][1p] | Merged into plugins bran | [^1] | +| amarillo-gtfs-generator | [Link][2g] | [Link][2f] | main | 🔴 0.0.2 | [Link][2m] | 🔴 [PyPI][] | [Link][2p] | Not merged | [^2] | +| amarillo-enhancer | [Link][3g] | [Link][3f] | fastapi | 🔴 0.0.5 | [Link][3m] | 🔴 [PyPI][] | [Link][3p] | Conflicts, fixed locally | [^3] | +| amarillo-compose | [Link][4g] | [Link][4f] | dev | 🔴 - | [Link][4m] | 🔴 [PyPI][] | [Link][4p] | Not merged | [^4] | +| amarillo-gtfs-exporter | [Link][5g] | [Link][5f] | separate-generator | 🔴 0.0.4 | [Link][5m] | 🔴 [PyPI][] | - | Not merged | [^5] | +| amarillo-metrics | [Link][6g] | [Link][6f] | main | 🔴 0.0.6 | [Link][6m] | 🔴 [PyPI][] | [Link][6p] | Readme PR not merged; | [^6] | +| amarillo-stops | - | - | | 🔴 0.0.2 | 🟢 [Link][7m] | 🔴 [PyPI][] | - | - | 🔴 [^7] | +| amarillo-grfs-export | [Link][8g] | - | | 🔴 | 🔴 | 🔴 [PyPI][] | - | - | [^8] | [^1]: New PR: Call to enhancer, base and derived images, carpool event hooks ✓
@@ -19,5 +20,43 @@ amarillo-grfs-export | Link | - | | | | - | - | [^8] [^4]: Readme ✓
CI/CD: On pushed change, deploy webhook is notified [^5]: TODO: remove oauth dependency ✓ and create PR from that [^6]: errors.log permissions ✓ -[^7]: Readme ✓ in progress
Jenkinsfile ✓ -[^8]: Deprecated; functionality should be moved to new repo amarillo-grfs-generator in a way that is compatible with exporter \ No newline at end of file +[^7]: Readme ✓ in progress
✓ Jenkinsfile
☐ GH About section empty +[^8]: Deprecated; functionality should be moved to new repo amarillo-grfs-generator in a way that is compatible with exporter + +🔴 🟢 🟡 + +[1g]: https://git.gerhardt.io/amarillo/amarillo-core +[1f]: https://github.com/frsaba/amarillo +[1m]: https://github.com/mfdz/amarillo +[1p]: https://github.com/mfdz/amarillo/pull/34 +[2g]: https://git.gerhardt.io/amarillo/amarillo-gtfs-generator +[2f]: https://github.com/frsaba/amarillo-gtfs-generator +[2m]: https://github.com/mfdz/amarillo-gtfs-generator +[2p]: https://github.com/mfdz/amarillo-gtfs-generator/pull/1 +[3g]: https://git.gerhardt.io/amarillo/amarillo-enhancer +[3f]: https://github.com/frsaba/amarillo-enhancer +[3m]: https://github.com/mfdz/amarillo-enhancer +[3p]: https://github.com/mfdz/amarillo-enhancer/pull/5 +[4g]: https://git.gerhardt.io/amarillo/amarillo-compose +[4f]: https://github.com/frsaba/amarillo-compose +[4m]: https://github.com/mfdz/amarillo-compose +[4p]: https://github.com/mfdz/amarillo-compose/pull/1 +[5g]: https://git.gerhardt.io/amarillo/amarillo-gtfs-export +[5f]: https://github.com/frsaba/amarillo-gtfs-exporter +[5m]: https://github.com/mfdz/amarillo-gtfs-exporter +[6g]: https://git.gerhardt.io/amarillo/amarillo-metrics +[6f]: https://github.com/frsaba/amarillo-metrics +[6m]: https://github.com/mfdz/amarillo-metrics +[6p]: https://github.com/mfdz/amarillo-metrics/pull/3 +[7g]: https://git.gerhardt.io/amarillo/amarillo-stops +[7f]: https://github.com/frsaba/amarillo-stops +[7m]: https://github.com/mfdz/amarillo-stops +[8g]: https://git.gerhardt.io/amarillo/amarillo-grfs-export +[8f]: https://github.com/frsaba/amarillo-grfs-export +[8m]: https://github.com/mfdz/amarillo-grfs-export + +Release process +1. increment version in project.toml, commit, tag with "vx.y.z" with "v" prefix +2. get the PyPI link after Jenkins has published the package +3. on GH create new release, use above tag, name "vx.y.z", in description put PyPI link e.g. https://pypi.org/project/amarillo-stops/0.0.1/, (sources.zip is added automatically) +