mirror of
https://github.com/PlaneQuery/OpenAirframes.git
synced 2026-06-10 23:17:47 +02:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 145f1006be | |||
| f5465f0552 | |||
| 17098ae39a | |||
| 6f6b65780a |
@@ -8,7 +8,7 @@ body:
|
|||||||
- type: markdown
|
- type: markdown
|
||||||
attributes:
|
attributes:
|
||||||
value: |
|
value: |
|
||||||
Submit **one object** or an **array of objects** that matches the community submission schema.
|
Submit **one object** or an **array of objects** that matches the community submission [schema](https://github.com/PlaneQuery/OpenAirframes/blob/main/schemas/community_submission.v1.schema.json). Reuse existing tags from the schema when possible.
|
||||||
|
|
||||||
**Rules (enforced on review/automation):**
|
**Rules (enforced on review/automation):**
|
||||||
- Each object must include **at least one** of:
|
- Each object must include **at least one** of:
|
||||||
@@ -27,7 +27,7 @@ body:
|
|||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"registration_number": "N12345",
|
"registration_number": "N12345",
|
||||||
"tags": {"owner": "John Doe"},
|
"tags": {"owner": "John Doe", "photo": "https://example.com/photo.jpg"},
|
||||||
"start_date": "2025-01-01"
|
"start_date": "2025-01-01"
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -48,29 +48,52 @@ jobs:
|
|||||||
git fetch origin "$branch_name"
|
git fetch origin "$branch_name"
|
||||||
git checkout "$branch_name"
|
git checkout "$branch_name"
|
||||||
|
|
||||||
# Merge main into PR branch
|
|
||||||
git config user.name "github-actions[bot]"
|
git config user.name "github-actions[bot]"
|
||||||
git config user.email "github-actions[bot]@users.noreply.github.com"
|
git config user.email "github-actions[bot]@users.noreply.github.com"
|
||||||
|
|
||||||
if git merge origin/main -m "Merge main to update schema"; then
|
# Get the community submission file(s) and schema from this branch
|
||||||
# Regenerate schema for this PR's submission (adds any new tags)
|
community_files=$(git diff --name-only origin/main...HEAD -- 'community/' 'schemas/')
|
||||||
python -m src.contributions.regenerate_pr_schema || true
|
|
||||||
|
|
||||||
# If there are changes, commit and push
|
if [ -z "$community_files" ]; then
|
||||||
if [ -n "$(git status --porcelain schemas/)" ]; then
|
echo " No community/schema files found in PR #$pr_number, skipping"
|
||||||
git add schemas/
|
git checkout main
|
||||||
git commit -m "Update schema with new tags"
|
continue
|
||||||
git push origin "$branch_name"
|
fi
|
||||||
echo " Updated PR #$pr_number with schema changes"
|
|
||||||
else
|
echo " Files to preserve: $community_files"
|
||||||
git push origin "$branch_name"
|
|
||||||
echo " Merged main into PR #$pr_number"
|
# Save the community files content
|
||||||
|
mkdir -p /tmp/pr_files
|
||||||
|
for file in $community_files; do
|
||||||
|
if [ -f "$file" ]; then
|
||||||
|
mkdir -p "/tmp/pr_files/$(dirname "$file")"
|
||||||
|
cp "$file" "/tmp/pr_files/$file"
|
||||||
fi
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
# Reset branch to main (clean slate)
|
||||||
|
git reset --hard origin/main
|
||||||
|
|
||||||
|
# Restore the community files
|
||||||
|
for file in $community_files; do
|
||||||
|
if [ -f "/tmp/pr_files/$file" ]; then
|
||||||
|
mkdir -p "$(dirname "$file")"
|
||||||
|
cp "/tmp/pr_files/$file" "$file"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
rm -rf /tmp/pr_files
|
||||||
|
|
||||||
|
# Regenerate schema with current main + this submission's tags
|
||||||
|
python -m src.contributions.regenerate_pr_schema || true
|
||||||
|
|
||||||
|
# Stage and commit all changes
|
||||||
|
git add community/ schemas/
|
||||||
|
if ! git diff --cached --quiet; then
|
||||||
|
git commit -m "Community submission (rebased on main)"
|
||||||
|
git push --force origin "$branch_name"
|
||||||
|
echo " Rebased PR #$pr_number onto main"
|
||||||
else
|
else
|
||||||
echo " Merge conflict in PR #$pr_number, adding comment"
|
echo " No changes needed for PR #$pr_number"
|
||||||
gh pr comment "$pr_number" --body $'⚠️ **Merge Conflict**\n\nAnother community submission was merged and this PR has conflicts.\n\nA maintainer may need to:\n1. Close this PR\n2. Remove the `approved` label from the original issue\n3. Re-add the `approved` label to regenerate the PR'
|
|
||||||
git merge --abort
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
git checkout main
|
git checkout main
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ A daily release is created at **06:00 UTC** and includes:
|
|||||||
All [FAA registration data](https://www.faa.gov/licenses_certificates/aircraft_certification/aircraft_registry/releasable_aircraft_download) from 2023-08-16 to present (~260 MB)
|
All [FAA registration data](https://www.faa.gov/licenses_certificates/aircraft_certification/aircraft_registry/releasable_aircraft_download) from 2023-08-16 to present (~260 MB)
|
||||||
|
|
||||||
- **openairframes_adsb.csv**
|
- **openairframes_adsb.csv**
|
||||||
Airframe information derived from ADS-B messages on the [ADSB.lol](https://www.adsb.lol/) network, from 2026-02-12 to present. The airframe information originates from [mictronics aircraft database](https://www.mictronics.de/aircraft-database/) (~5 MB).
|
Airframe information derived from ADS-B messages on the [ADSB.lol](https://www.adsb.lol/) network, from 2026-02-12 to present (will be from 2024-01-01 soon). The airframe information originates from [mictronics aircraft database](https://www.mictronics.de/aircraft-database/) (~5 MB).
|
||||||
|
|
||||||
- **ReleasableAircraft_{date}.zip**
|
- **ReleasableAircraft_{date}.zip**
|
||||||
A daily snapshot of the FAA database, which updates at **05:30 UTC**
|
A daily snapshot of the FAA database, which updates at **05:30 UTC**
|
||||||
@@ -43,7 +43,8 @@ Please try to follow the submission formatting guidelines. If you are struggling
|
|||||||
|
|
||||||
## For Developers
|
## For Developers
|
||||||
All code, compute (GitHub Actions), and storage (releases) are in this GitHub repository Improvements are welcome. Potential features include:
|
All code, compute (GitHub Actions), and storage (releases) are in this GitHub repository Improvements are welcome. Potential features include:
|
||||||
- Web UI
|
- Web UI for data
|
||||||
|
- Web UI for contributors
|
||||||
- Additional export formats in the daily release
|
- Additional export formats in the daily release
|
||||||
- Data fusion from multiple sources in the daily release
|
- Data fusion from multiple sources in the daily release
|
||||||
- Automated airframe data connectors, including (but not limited to) civil aviation authorities and airline APIs
|
- Automated airframe data connectors, including (but not limited to) civil aviation authorities and airline APIs
|
||||||
|
|||||||
Reference in New Issue
Block a user