update add iana repo

Author: swoiow

.github/workflows/build-iana-punched.yml

@@ -0,0 +1,81 @@
+name: Build IANA Punched Dat
+
+on:
+  workflow_call:
+    inputs:
+      private_src_repo_slug:
+        description: "Private source repository slug"
+        required: true
+        type: string
+      private_src_ref:
+        description: "Private source repository ref"
+        required: false
+        default: "main"
+        type: string
+    secrets:
+      iana_private_repo_token:
+        description: "Token for iana private repository checkout"
+        required: true
+      poptrie_private_repo_token:
+        description: "Token for private repository checkout"
+        required: true
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout public repo
+        uses: actions/checkout@v6
+
+      - name: Checkout private iana repo
+        uses: actions/checkout@v6
+        with:
+          repository: harmonsir/iana-geoip
+          token: ${{ secrets.iana_private_repo_token }}
+          ref: main
+          path: iana-src
+
+      - name: Checkout private repo
+        uses: actions/checkout@v6
+        with:
+          repository: ${{ inputs.private_src_repo_slug }}
+          token: ${{ secrets.poptrie_private_repo_token }}
+          ref: ${{ inputs.private_src_ref }}
+          path: private-src
+
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: "3.13"
+
+      - name: Set up Rust toolchain
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: stable
+
+      - name: Build punched iana-geoip.dat via Rust
+        run: |
+          set -euo pipefail
+          mkdir -p "$GITHUB_WORKSPACE/dist"
+          rm -rf iana-data
+          git clone --depth 1 https://github.com/HotCakeX/Official-IANA-IP-blocks iana-data
+          cargo build --release --manifest-path iana-src/Cargo.toml
+          ./iana-src/target/release/geoip_checker process \
+            --ipv4-dir iana-data/TXT/IPV4 \
+            --ipv6-dir iana-data/TXT/IPV6 \
+            --output-dir iana-src/TXT
+          ./iana-src/target/release/geoip_checker check --output-dir iana-src/TXT
+          python "$GITHUB_WORKSPACE/private-src/build_bin.py" \
+            --input "$GITHUB_WORKSPACE/iana-src/TXT" \
+            --output "$GITHUB_WORKSPACE/dist/iana-geoip.dat"
+
+      - name: Upload punched iana dat
+        uses: actions/upload-artifact@v6
+        with:
+          name: iana-punched-dat
+          path: dist/iana-geoip.dat
+          retention-days: 3

.github/workflows/release.yml

@@ -56,6 +56,16 @@ jobs:
               });
             }
 
+  build_iana_punched:
+    if: github.event_name == 'push' || github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && (inputs.run_build == 'true' || inputs.run_cron == 'true'))
+    uses: ./.github/workflows/build-iana-punched.yml
+    with:
+      private_src_repo_slug: ${{ vars.POPTRIE_PRIVATE_REPO_SLUG }}
+      private_src_ref: ${{ vars.POPTRIE_PRIVATE_REPO_REF || 'main' }}
+    secrets:
+      iana_private_repo_token: ${{ secrets.HARMONSIR_IANA_GEOIP_REPO_TOKEN }}
+      poptrie_private_repo_token: ${{ secrets.GH_POPTRIE_TOKEN }}
+
   build:
     runs-on: ${{ matrix.os }}
     if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && inputs.run_build == 'true')
@@ -154,7 +164,7 @@ jobs:
 
   release:
     runs-on: ubuntu-latest
-    needs: build
+    needs: [ build, build_iana_punched ]
     permissions:
       contents: write
     if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && inputs.run_build == 'true')
@@ -249,22 +259,32 @@ jobs:
             --iana-zip-url "https://github.com/HotCakeX/Official-IANA-IP-blocks/archive/refs/heads/main.zip" \
             --out-cn dist/geo-cn.dat \
             --out-geoip dist/bgp-geoip.dat \
-            --out-iana dist/iana-geoip.dat
+            --out-iana dist/iana-geoip-std.dat
+
+      - name: Download punched iana dat
+        uses: actions/download-artifact@v7
+        continue-on-error: false
+        with:
+          name: iana-punched-dat
+          path: dist
 
       - name: Publish latest release
         uses: softprops/action-gh-release@v2
         with:
           tag_name: latest
           name: latest
           generate_release_notes: true
+          fail_on_unmatched_files: false
           files: |
             dist/*.whl
             dist/geo-cn.dat
             dist/bgp-geoip.dat
             dist/iana-geoip.dat
+            dist/iana-geoip-std.dat
 
   cron_release:
     runs-on: ubuntu-latest
+    needs: build_iana_punched
     permissions:
       contents: write
     if: github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && inputs.run_cron == 'true')
@@ -303,7 +323,14 @@ jobs:
             --iana-zip-url "https://github.com/HotCakeX/Official-IANA-IP-blocks/archive/refs/heads/main.zip" \
             --out-cn dist/geo-cn.dat \
             --out-geoip dist/bgp-geoip.dat \
-            --out-iana dist/iana-geoip.dat
+            --out-iana dist/iana-geoip-std.dat
+
+      - name: Download punched iana dat
+        uses: actions/download-artifact@v7
+        continue-on-error: false
+        with:
+          name: iana-punched-dat
+          path: dist
 
       - name: Set release tag
         run: echo "CRON_TAG=cron-$(date -u +%Y%m%d)" >> $GITHUB_ENV
@@ -313,6 +340,7 @@ jobs:
         with:
           tag_name: ${{ env.CRON_TAG }}
           name: ${{ env.CRON_TAG }}
+          fail_on_unmatched_files: false
           files: |
             dist/geo-cn.dat
             dist/bgp-geoip.dat