Merge branch 'TravelMapping:master' into master

Author: si404

.github/workflows/build-json.yml

@@ -38,18 +38,25 @@ jobs:
       - name: Check for unknown airport codes
         run: python air/scripts/check_unknown_codes.py
 
-      - name: Commit unknown_codes.txt
+      - name: Show modified files
+        run: |
+          git status
+          git diff --name-only
+
+      - name: Commit all modified files safely
         run: |
           git config user.name "GitHub Action"
           git config user.email "action@github.com"
-          git add air/data/unknown_codes.txt
-          git commit -m "Update list of unknown airport codes" || echo "Nothing to commit"
-          git push origin master
+          git add -A
+          git commit -m "Auto-commit modified files from build" || echo "Nothing to commit"
+          git pull --rebase origin master
+          git push
 
       - name: Commit and push updated JSON
         run: |
           git config user.name "GitHub Action"
           git config user.email "action@github.com"
+          git pull --rebase origin master
           git add air/data/*.json
           git commit -m "Auto-update JSON from .alist" || echo "Nothing to commit"
           git push origin master

.github/workflows/deploy-pages.yml

@@ -0,0 +1,33 @@
+name: Deploy Airport Maps
+
+on:
+  workflow_run:
+    workflows: ["Build JSON from .alist"]
+    types:
+      - completed
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '16'
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+
+      - name: Run build_data.py
+        run: python air/scripts/build_data.py
+
+      - name: Build and Deploy to GitHub Pages
+        uses: actions/configure-pages@v3
+      # Add additional steps here as needed based on your actual deployment logic

.github/workflows/update-master-list.yml

@@ -21,10 +21,12 @@ jobs:
         run: |
           python air/scripts/extract_codes.py
 
-      - name: Commit generated file
+      - name: Commit generated file safely
         run: |
           git config user.name "GitHub Actions"
           git config user.email "actions@github.com"
           git add air/data/airports-master.csv
-          git commit -m "Update airports-master.csv automatically"
+          git commit -m "Update airports-master.csv automatically" || echo "Nothing to commit"
+          git pull --rebase origin master
           git push
+