Merge pull request #6 from cvvergara/dev-actions-fix

Develop fix actions
pgRouting · Jun 2, 2021 · 1482e08 · 1482e08
2 parents 0dd9c58 + 10f7d16
commit 1482e08
Show file tree

Hide file tree

Showing 34 changed files with 244 additions and 187 deletions.
diff --git a/.github/workflows/boost_version.yml b/.github/workflows/boost_version.yml
@@ -76,8 +76,16 @@ jobs:
           make -j 4
           sudo make install
 
-      - name: Test
+      - name: Unapck data
+        run: |
+          cd tools/testers
+          tar -xf matrix_new_values.tar.gz
+
+      - name: pgTap test
         run: |
           sudo service postgresql start
-          sudo -u postgres createdb -p 5432  ___vrp___test___
-          sudo -u postgres bash ./tools/testers/pg_prove_tests.sh postgres 5432  Release
+          sudo -u postgres createdb -p 5432 ___vrp___test___
+          cd tools/testers
+          sudo -u postgres psql -p 5432 -U postgres -d ___vrp___test___ -X -q -v ON_ERROR_STOP=1 --pset pager=off -f setup_db.sql
+          sudo -u postgres pg_prove --failures --quiet --recurse --ext .sql -p 5432 -d ___vrp___test___ -U postgres ../../pgtap/
+
diff --git a/.github/workflows/check-queries.yml b/.github/workflows/check-queries.yml
@@ -73,13 +73,19 @@ jobs:
           tools/scripts/get_signatures.sh -p ${PGPORT}
           git diff --exit-code --quiet sql/sigs/*.sig
 
+      - name: Unapck data
+        run: |
+          cd tools/testers
+          tar -xf matrix_new_values.tar.gz
+
       - name: Test documentation queries are up to date
         run: |
-          sudo -u postgres createdb -p ${PGPORT}  pgr_test__db__test
+          sudo -u postgres createdb -p ${PGPORT}  ___vrp___test___
+
           TESTDIRS="version"
           for d in ${TESTDIRS}
           do
-            ./tools/testers/doc_queries_generator.pl -pgver "${PGVER}" -pguser runner -documentation -alg "${d}"
+            ./tools/testers/doc_queries_generator.pl -pgport "${PGPORT}" -documentation -alg "${d}"
           done
 
-          ./tools/testers/doc_queries_generator.pl -pgver "${PGVER}"
+          ./tools/testers/doc_queries_generator.pl -pgport "${PGPORT}"
diff --git a/.github/workflows/clang.yml b/.github/workflows/clang.yml
@@ -18,8 +18,8 @@ jobs:
     strategy:
         fail-fast: false
         matrix:
-          psql: [12]
           postgis: [3]
+          release: [Debug,Release]
           os: [ubuntu-latest]
 
     steps:
@@ -32,7 +32,7 @@ jobs:
           echo "PGVER=${pgver}" >> $GITHUB_ENV
           PGP=5433
           if [ "${{ matrix.psql }}" == "${pgver}" ]; then PGP=5432; fi
-          echo "PGPORT=${PGP}" >> $GITHUB_ENV
+          echo "PGPORT=5432" >> $GITHUB_ENV
 
       - name: Add PostgreSQL APT repository
         run: |
@@ -48,29 +48,35 @@ jobs:
             clang \
             libboost-graph-dev \
             libtap-parser-sourcehandler-pgtap-perl \
-            postgresql-${{ matrix.psql }} \
-            postgresql-${{ matrix.psql }}-pgtap \
-            postgresql-${{ matrix.psql }}-postgis-${{ matrix.postgis }} \
-            postgresql-${{ matrix.psql }}-postgis-${{ matrix.postgis }}-scripts \
-            postgresql-${{ matrix.psql }}-pgrouting \
-            postgresql-server-dev-${{ matrix.psql }}
+            postgresql-${PGVER} \
+            postgresql-${PGVER}-pgtap \
+            postgresql-${PGVER}-postgis-${{ matrix.postgis }} \
+            postgresql-${PGVER}-postgis-${{ matrix.postgis }}-scripts \
+            postgresql-${PGVER}-pgrouting \
+            postgresql-server-dev-${PGVER}
 
       - name: Configure
         run: |
-          export PATH=/usr/lib/postgresql/${{ matrix.psql }}/bin:$PATH
+          export PATH=/usr/lib/postgresql/${PGVER}/bin:$PATH
           mkdir build
           cd build
-          CXX=clang++ CC=clang cmake -DPOSTGRESQL_VERSION=${{ matrix.psql }} -DCMAKE_BUILD_TYPE=Debug -DWITH_DOC=OFF ..
+          CXX=clang++ CC=clang cmake -DPOSTGRESQL_VERSION=${PGVER} -DCMAKE_BUILD_TYPE=${{ matrix.release }} -DWITH_DOC=OFF ..
 
       - name: Build
         run: |
           cd build
           make -j 4
           sudo make install
 
-      - name: Test
+      - name: Unapck data
+        run: |
+          cd tools/testers
+          tar -xf matrix_new_values.tar.gz
+
+      - name: pgTap test
         run: |
-          echo "test pending"
           sudo service postgresql start
           sudo -u postgres createdb -p ${PGPORT}  ___vrp___test___
-          sudo -u postgres bash ./tools/testers/pg_prove_tests.sh postgres ${PGPORT}  Debug
+          cd tools/testers
+          sudo -u postgres psql -p "${PGPORT}" -U postgres -d ___vrp___test___ -X -q -v ON_ERROR_STOP=1 --pset pager=off -f setup_db.sql
+          sudo -u postgres pg_prove --failures --quiet --recurse --ext .sql -p "${PGPORT}" -d ___vrp___test___ -U postgres ../../pgtap/
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -18,6 +18,22 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
+      - name: install deps
+        run: |
+          brew install postgis boost pgrouting
+
+      - name: Configure
+        run: |
+          mkdir build
+          cd build
+          cmake -DCMAKE_BUILD_TYPE=Release -DWITH_DOC=OFF ..
+
+      - name: Build
+        run: |
+          cd build
+          make -j
+          sudo make install
+
       - name: Cache pgtap
         id: cache-pgtap
         uses: actions/cache@v2
@@ -47,26 +63,18 @@ jobs:
           sudo make install
           cpan TAP::Parser::SourceHandler::pgTAP
 
-      - name: install deps
-        run: |
-          brew install postgis boost pgrouting
-
-      - name: Configure
+      - name: Unapck data
         run: |
-          mkdir build
-          cd build
-          cmake -DCMAKE_BUILD_TYPE=Release -DWITH_DOC=OFF ..
-
-      - name: Build
-        run: |
-          cd build
-          make -j
-          sudo make install
+          cd tools/testers
+          tar -xf matrix_new_values.tar.gz
 
       - name: Test
         run: |
           export PATH=/usr/local/Cellar/perl/$(perl -e 'print substr($^V, 1)')/bin:$PATH
           pg_ctl -D /usr/local/var/postgres start
           createuser -s postgres
           createdb ___vrp___test___
-          bash ./tools/testers/pg_prove_tests.sh postgres 5432 Release
+          cd tools/testers
+          psql -p 5432 -U postgres -d ___vrp___test___ -X -q -v ON_ERROR_STOP=1 --pset pager=off -f setup_db.sql
+          psql -p 5432 -U postgres -d ___vrp___test___ -c "SELECT * FROM pgr_full_version();"
+          pg_prove --failures --quiet --recurse --ext .sql -p 5432 -d ___vrp___test___ -U postgres ../../pgtap/
diff --git a/.github/workflows/publish-users-doc.yml → .github/workflows/publish-doc.yml b/.github/workflows/publish-users-doc.yml → .github/workflows/publish-doc.yml
@@ -2,7 +2,10 @@ name: Publish Users Documentation
 
 on:
   workflow_dispatch:
-
+  push:
+    branches:
+      - main
+      - develop
 
 jobs:
   release:
@@ -28,6 +31,14 @@ jobs:
           echo "PGIS=3" >> $GITHUB_ENV
           echo "PROJECT_VERSION=${PROJECT_VERSION}" >> $GITHUB_ENV
 
+      - name: Extract branch name and commit hash
+        run: |
+          raw=$(git branch -r --contains ${{ github.ref }})
+          branch=${raw##*/}
+          echo "BRANCH=$branch" >> $GITHUB_ENV
+          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
@@ -67,8 +78,7 @@ jobs:
         run: |
           cd build
           make doc
-          make -j 4
-          sudo make install
+          make doxy
 
       - name: Initialize mandatory git config
         run: |
@@ -77,17 +87,38 @@ jobs:
 
       - name: Update Users Documentation
         run: |
+          if [[ "${{ env.BRANCH }}" == "main" ]]; then
+            FOLDER_NAME="main"
+          elif [[ "${{ env.BRANCH }}" == "develop" ]]; then
+            FOLDER_NAME="dev"
+          fi
           git checkout origin/gh-pages
           git checkout -b gh-pages
-          PROJECT_MAJOR_MINOR="v${PROJECT_VERSION%.*}"
-          rm -rf ${PROJECT_MAJOR_MINOR}
-          cp -r build/doc/html ${PROJECT_MAJOR_MINOR}
-          rm -rf ${PROJECT_MAJOR_MINOR}/es
-          git add ${PROJECT_MAJOR_MINOR}
-          git diff-index --quiet HEAD || git commit -m "Update users documentation for ${PROJECT_VERSION}"
+          rm -rf ${FOLDER_NAME}
+          cp -r build/doc/html ${FOLDER_NAME}
+          git add ${FOLDER_NAME}
+          git diff-index --quiet HEAD || git commit -m "Update users documentation for ${PROJECT_VERSION} (${{ env.BRANCH }}): commit ${{ env.GIT_HASH }}"
+          git fetch origin
+          git rebase origin/gh-pages
+          git push origin gh-pages
+          git checkout @{-2}
+
+      - name: Update Developers Documentation
+        run: |
+          if [[ "${{ env.BRANCH }}" == "main" ]]; then
+            FOLDER_NAME="main"
+          elif [[ "${{ env.BRANCH }}" == "develop" ]]; then
+            FOLDER_NAME="dev"
+          fi
+          git checkout gh-pages
+          rm -rf doxy/${FOLDER_NAME}
+          cp -r build/doxygen/html doxy/${FOLDER_NAME}
+          git add doxy/${FOLDER_NAME}
+          git diff-index --quiet HEAD || git commit -m "Update developers documentation for ${PROJECT_VERSION} (${{ env.BRANCH }}): commit ${{ env.GIT_HASH }}"
           git fetch origin
           git rebase origin/gh-pages
           git push origin gh-pages
+          git checkout @{-1}
 
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -99,30 +99,16 @@ jobs:
         run: |
           git checkout origin/gh-pages
           git checkout -b gh-pages
-          PROJECT_MAJOR_MINOR="v${PROJECT_VERSION%.*}"
-          rm -rf ${PROJECT_MAJOR_MINOR}
-          cp -r build/doc/html ${PROJECT_MAJOR_MINOR}
-          rm -rf ${PROJECT_MAJOR_MINOR}/es
-          git add ${PROJECT_MAJOR_MINOR}
-          git diff-index --quiet HEAD || git commit -m "Update users documentation for ${PROJECT_VERSION}"
+          PROJECT_MAJOR="v${PROJECT_VERSION%%.*}"
+          rm -rf ${PROJECT_MAJOR}
+          cp -r build/doc/html ${PROJECT_MAJOR}
+          git add ${PROJECT_MAJOR}
+          git diff-index --quiet HEAD || git commit -m "Update users documentation for ${PROJECT_VERSION} (tag ${TAG_NAME})"
           git fetch origin
           git rebase origin/gh-pages
           git push origin gh-pages
           git checkout @{-2}
 
-      - name: Update Developers Documentation
-        if: ${{ env.BRANCH == 'main' }}
-        run: |
-          git checkout gh-pages
-          rm -rf doxy/main
-          cp -r build/doxygen/html doxy/main
-          git add doxy/main
-          git diff-index --quiet HEAD || git commit -m "Update developers documentation for ${PROJECT_VERSION}"
-          git fetch origin
-          git rebase origin/gh-pages
-          git push origin gh-pages
-          git checkout @{-1}
-
       - name: Download Assets
         run: |
           wget -c https://github.com/${{ github.repository }}/archive/${TAG_NAME}.zip

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -18,8 +18,9 @@ jobs:
     strategy:
         fail-fast: false
         matrix:
-          psql: [10,11,12, 13]
+          psql: [12, 13]
           postgis: [2.5,3]
+          release: [Debug, Release]
           os: [ubuntu-latest]
 
     steps:
@@ -59,16 +60,23 @@ jobs:
           export PATH=/usr/lib/postgresql/${{ matrix.psql }}/bin:$PATH
           mkdir build
           cd build
-          cmake -DPOSTGRESQL_VERSION=${{ matrix.psql }} -DCMAKE_BUILD_TYPE=Release -DWITH_DOC=OFF ..
+          cmake -DPOSTGRESQL_VERSION=${{ matrix.psql }} -DCMAKE_BUILD_TYPE=${{ matrix.release }} -DWITH_DOC=OFF ..
 
       - name: Build
         run: |
           cd build
           make -j 4
           sudo make install
 
-      - name: Test
+      - name: Unapck data
+        run: |
+          cd tools/testers
+          tar -xf matrix_new_values.tar.gz
+
+      - name: pgTap test
         run: |
           sudo service postgresql start
           sudo -u postgres createdb -p ${PGPORT}  ___vrp___test___
-          sudo -u postgres bash ./tools/testers/pg_prove_tests.sh postgres ${PGPORT}  Release
+          cd tools/testers
+          sudo -u postgres psql -p "${PGPORT}" -U postgres -d ___vrp___test___ -X -q -v ON_ERROR_STOP=1 --pset pager=off -f setup_db.sql
+          sudo -u postgres pg_prove --failures --quiet --recurse --ext .sql -p "${PGPORT}" -d ___vrp___test___ -U postgres ../../pgtap/
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,14 +17,14 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 #---------------------------------------------
 #---------------------------------------------
 
-project(VRPROUTING VERSION 0.1.0
+project(VRPROUTING VERSION 0.2.0
   LANGUAGES C CXX )
-set(PROJECT_VERSION_DEV "")
+set(PROJECT_VERSION_DEV "-dev")
 string(TOLOWER "${PROJECT_NAME}" PROJECT_NAME_LOWER)
 
-set(MINORS 0.0 0.1)
+set(MINORS 0.2 0.1)
 set(OLD_SIGNATURES
-    0.0.0
+    0.1.0
   )
 
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -6,12 +6,12 @@ If you have not already, come find us in [![Join the chat at https://gitter.im/p
 
 Here are some important resources:
 
-  * [pgRouting for Developers](http://docs.pgrouting.org/doxy/2.4/index.html) has the internals C/C++ code information,
+  * [vrpRouting for Developers](http://vrp.pgrouting.org/doxy/main/index.html) has the internals C/C++ code information,
   * [Wish list on the wiki](https://github.com/pgRouting/pgrouting/wiki/GSoC-Ideas) is the foot view of what we think the community needs.
-  * [Additional wish lst](https://github.com/pgRouting/pgrouting/issues?q=is%3Aopen+is%3Aissue+label%3A%22Functionality+Request%22). (TODO to move the information to the wiki wish list)
-  * Participate on the [discussions](https://github.com/pgRouting/pgrouting/issues?q=is%3Aopen+is%3Aissue+label%3ADiscussion).
-  * Participate fixing [Documentation](https://github.com/pgRouting/pgrouting/issues?q=is%3Aopen+is%3Aissue+label%3ADocumentation).
-  * Find a bug? [Let us know](https://github.com/pgRouting/pgrouting/issues).
+  * [Additional wish lst](https://github.com/pgRouting/vrprouting/issues?q=is%3Aopen+is%3Aissue+label%3A%22Functionality+Request%22). (TODO to move the information to the wiki wish list)
+  * Participate on the [discussions](https://github.com/pgRouting/vrprouting/discussions)
+  * Participate fixing [Documentation](https://github.com/pgRouting/vrprouting/issues?q=is%3Aopen+is%3Aissue+label%3ADocumentation).
+  * Find a bug? [Let us know](https://github.com/pgRouting/vrprouting/issues).
 
 ## Contribution agreement
 
@@ -22,9 +22,8 @@ Any kind of contribution will automatically fall to the following Licences:
   - Indirectly by posting code on issues/wiki/gitter/mailng lists
 - Documentation contribution:
   - Creative Commons Attribution-Share Alike 3.0
-
-## Submitting changes
 
+## Submitting changes
 
 Write a clear log message for your commits. One-line messages are fine for small changes, but bigger changes should have more information.
 Fill the commit message template.

diff --git a/NEWS b/NEWS
@@ -1,7 +1,8 @@
 
+v0.2.0 Release Notes
+*******************************************************************************
 
-
-v0.0.0 Release Notes
+v0.1.0 Release Notes
 *******************************************************************************
 
 *Extraction tasks*