Update dbip_download.yml

Author: czarte

.github/workflows/dbip_download.yml

@@ -3,10 +3,9 @@ name: Download DBIP data and generate dbip_country.rs
 on:
   workflow_dispatch:
 #  schedule:
-#    - cron: "0 0 3 * *" # Runs at midnight on the 3rd of every month
+#    - cron: "0 0 * * *" # Runs at midnight on the 3rd of every month
 
 env:
-  SKIP_EXPORT: 'false'
   TEMP_DIR: '/tmp'
   YEAR_MONTH: '01-9999'
 
@@ -18,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Rust
         uses: actions-rs/toolchain@v1
@@ -27,37 +26,38 @@ jobs:
 
       - name: Download DBIP data in MMDB format
         run: |
-          cd ip_country
+          set -xv
           export YEAR_MONTH=$(date +%Y-%m)
           echo "TEMP_DIR=$(mktemp -d)" >> $GITHUB_ENV
           echo "YEAR_MONTH=$YEAR_MONTH" >> $GITHUB_ENV
+          git clone https://github.com/MASQ-Project/DBIP-Experiment.git dbipexperiment
+          cd dbipexperiment/ip_country
           mkdir -p dbip-data
           curl -L -o dbip-data/dbip-country-lite.mmdb.gz "https://download.db-ip.com/free/dbip-country-lite-$YEAR_MONTH.mmdb.gz"
           gunzip dbip-data/dbip-country-lite.mmdb.gz
-          if [ "$?" -ne "0" ]; then 
-            echo "SKIP_EXPORT=true" >> $GITHUB_ENV 
-          fi
 
       - name: Generate Rust source file
-        if: ${{ env.SKIP_EXPORT == 'false' }}
         run: |
-          cd ip_country
-          mkdir -p generated
+          set -xv
+          cd dbipexperiment/ip_country
           cargo run < "dbip-data/dbip-country-lite.mmdb" > "$TEMP_DIR"/dbip_country.rs
           ls "$TEMP_DIR"
-          if [ "$?" -ne "0" ]; then 
-            echo "SKIP_EXPORT=true" >> $GITHUB_ENV 
-          fi
 
       - name: Commit and push generated file
-        if: ${{ env.SKIP_EXPORT == 'false' }}
         run: |
+          set -xv
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
-          git checkout -B generated-source
-          git rm -rf .
-          mkdir ip_country/src
+          BRANCH=$(git ls-remote --heads 2>/dev/null | grep generated-source)
+          if [[ "$BRANCH" == "" ]]
+          then
+               git checkout -B generated-source
+               git rm -rf .
+               mkdir -p ip_country/src
+          else
+               git checkout generated-source
+          fi
           mv "${TEMP_DIR}"/dbip_country.rs ip_country/src/dbip_country.rs
           git add ip_country/src/dbip_country.rs
           git commit -m "Update generated dbip_country ${YEAR_MONTH} Rust source file"
-          git push origin generated-source --force
+          git push -u origin HEAD