Merge pull request #244 from pgRouting/develop

FOSS4G 2024 Belem workshop
pgRouting · Jan 24, 2025 · fb86c6f · fb86c6f
2 parents 7ee77de + 4944bc0
commit fb86c6f
Show file tree

Hide file tree

Showing 173 changed files with 11,629 additions and 14,303 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+      interval: "weekly"
diff --git a/tools/transifex/remove_obsolete_entries.sh → .github/scripts/remove_obsolete_entries.sh b/tools/transifex/remove_obsolete_entries.sh → .github/scripts/remove_obsolete_entries.sh
@@ -7,7 +7,7 @@
 # ------------------------------------------------------------------------------
 
 # For all the chapter files
-for file in $(find locale/en -type f -name "*.po"); do
+for file in $(find locale -type f -name "*.po"); do
     if grep -q '#~' $file; then
         perl -pi -0777 -e 's/#~.*//s' $file
         git add $file

diff --git a/.github/scripts/update_locale.sh b/.github/scripts/update_locale.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+# ------------------------------------------------------------------------------
+# /*PGR-GNU*****************************************************************
+# File: update_locale.sh
+# Copyright (c) 2021 pgRouting developers
+# Mail: project@pgrouting.org
+# ------
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# ********************************************************************PGR-GNU*/
+# ------------------------------------------------------------------------------
+
+DIR=$(git rev-parse --show-toplevel)
+
+pushd "${DIR}" > /dev/null || exit 1
+
+mkdir -p build
+pushd build > /dev/null || exit 1
+cmake -DLOCALE=ON ..
+
+make locale
+popd > /dev/null || exit 1
+
+# List all the files that needs to be committed in build/docs/locale_changes.txt
+awk '/^Update|^Create/{print $2}' build/docs/locale_changes.txt > build/docs/locale_changes_po.txt # .po files
+cp build/docs/locale_changes_po.txt build/docs/locale_changes_po_pot.txt
+perl -ne '/\/en\// && print' build/docs/locale_changes_po.txt | \
+    perl -pe 's/(.*)en\/LC_MESSAGES(.*)/$1pot$2t/' >> build/docs/locale_changes_po_pot.txt  # .pot files
+
+# Do not create empty translation files
+git status locale/es --porcelain | awk 'match($1, "?"){print $2}' | xargs -r rm -rf
+git status locale/ja --porcelain | awk 'match($1, "?"){print $2}' | xargs -r rm -rf
+
+# Remove obsolete entries #~ from .po files
+bash .github/scripts/remove_obsolete_entries.sh
+
+cat build/docs/locale_changes_po_pot.txt | xargs -I {} sh -c "(ls {}  >> /dev/null 2>&1 && git add {} )"
+
+popd > /dev/null || exit 1
diff --git a/.github/workflows/locale.yml b/.github/workflows/locale.yml
@@ -0,0 +1,98 @@
+name: Update Locale
+
+# This action runs:
+# - When this file changes
+# - When changes on documentation (doc)
+# - When is triggered manually
+
+on:
+  workflow_dispatch:
+  push:
+
+permissions:
+  contents: write
+
+jobs:
+  update-locale:
+    name: Update Locale
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Get postgres version
+        run: |
+          sudo service postgresql start
+          pgver=$(psql --version | grep -Po '(?<=psql \(PostgreSQL\) )[^;]+(?=\.\d+ \()')
+          echo "PGVER=${pgver}" >> $GITHUB_ENV
+          echo "PGIS=3" >> $GITHUB_ENV
+
+      - name: Extract branch name and commit hash
+        run: |
+          branch=${GITHUB_REF#refs/heads/}
+          git_hash=$(git rev-parse --short "$GITHUB_SHA")
+          echo "GIT_HASH=$git_hash" >> $GITHUB_ENV
+
+      - name: Add PostgreSQL APT repository
+        run: |
+          sudo apt-get install curl ca-certificates gnupg
+          curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+          sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ \
+            $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+
+      - name: Install python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y osm2pgrouting \
+            postgresql-${PGVER}-postgis-${PGIS} \
+            postgresql-${PGVER}-postgis-${PGIS}-scripts \
+            postgresql-${PGVER}-pgrouting
+
+          python -m pip install --upgrade pip
+          pip install -r REQUIREMENTS.txt
+          pip list
+
+      - name: Configure
+        run: |
+          service postgresql status
+          sudo service postgresql start
+          service postgresql status
+          sudo -u postgres createdb -p ${POSTGRES_PORT}  setup
+          sudo -u postgres psql -c 'CREATE ROLE "runner" SUPERUSER CREATEDB CREATEROLE INHERIT LOGIN PASSWORD $$runner$$;' -d setup
+          echo :5432:*:runner:runner >> .pgpass
+          sudo -u postgres psql -c 'CREATE ROLE "user" SUPERUSER CREATEDB CREATEROLE INHERIT LOGIN PASSWORD $$user$$;' -d setup
+          echo :5432:*:user:user >> .pgpass
+          mkdir build
+          cd build
+          cmake -DLOCALE=ON ..
+        env:
+          POSTGRES_HOST: localhost
+          POSTGRES_PORT: 5432
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: setup
+
+      - name: Initialize mandatory git config
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+
+      - name: Update locale
+        run: |
+          bash .github/scripts/update_locale.sh
+
+          # Add the files, commit and push
+          git diff --staged --quiet || git commit -m "Update locale: commit ${{ env.GIT_HASH }}"
+          git restore .  # Remove the unstaged changes before rebasing
+          git push
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -11,7 +11,7 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Get postgres version
         run: |
@@ -28,7 +28,7 @@ jobs:
             $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
 
       - name: Install python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 

diff --git a/.github/workflows/locale-and-website.yml → .github/workflows/website.yml b/.github/workflows/locale-and-website.yml → .github/workflows/website.yml
@@ -1,15 +1,15 @@
-name: Update Locale and Website
+name: Update Website
 
 on:
   workflow_dispatch:
   push:
     branches:
       - develop
-      - un-challenge
+      - main
 
 jobs:
   update-documentation:
-    name: Update Locale and Website
+    name: Update Website
     runs-on: ubuntu-latest
 
     strategy:
@@ -44,7 +44,7 @@ jobs:
             $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
 
       - name: Install python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 
@@ -72,7 +72,7 @@ jobs:
           echo :5432:*:user:user >> .pgpass
           mkdir build
           cd build
-          cmake -DLOCALE=ON -DPGR_WORKSHOP=ON -DES=ON ..
+          cmake -DES=ON ..
         env:
           POSTGRES_HOST: localhost
           POSTGRES_PORT: 5432
@@ -90,25 +90,6 @@ jobs:
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
 
-      - name: Update locale
-        if: github.ref == 'refs/heads/develop'
-        run: |
-          # List all the files that needs to be committed in build/docs/locale_changes.txt
-          awk '/^Update|^Create/{print $2}' build/docs/locale_changes.txt > tmp && mv tmp build/docs/locale_changes.txt        # .po files
-          cat build/docs/locale_changes.txt | perl -pe 's/(.*)en\/LC_MESSAGES(.*)/$1pot$2t/' >> build/docs/locale_changes.txt  # .pot files
-          cat build/docs/locale_changes.txt
-
-          # Remove obsolete entries #~ from .po files
-          tools/transifex/remove_obsolete_entries.sh
-
-          # Add the files, commit and push
-          for line in `cat build/docs/locale_changes.txt`; do git add "$line"; done
-          git diff --staged --quiet || git commit -m "Update locale: commit ${{ env.GIT_HASH }}"
-          git fetch origin develop
-          git restore .  # Remove the unstaged changes before rebasing
-          git rebase origin/develop
-          git push origin develop
-
       - name: Update Website
         run: |
           if [[ "${{ env.BRANCH }}" == "develop" ]]; then