Merge pull request #440 from hotosm/revert-438-ci/gh-workflows

Revert "Update workflows to use gh-workflows repo"

.github/workflows/docs.yml

@@ -1,24 +1,27 @@
-name: 📖 Publish Docs
+name: Publish docs
 
 on:
   push:
-    paths:
-      - docs/**
-      - src/**
-      - mkdocs.yml
-    branches: [master]
-  # Allow manual trigger (workflow_dispatch)
-  workflow_dispatch:
-
+    branches:
+      - master 
+permissions:
+  contents: write
 jobs:
-  build_doxygen:
-    uses: hotosm/gh-workflows/.github/workflows/doxygen_build.yml@1.0.1
-    with:
-      output_path: docs/apidocs
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v4
+        with:
+          python-version: 3.x
+      - run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV 
+
 
-  publish_docs:
-    uses: hotosm/gh-workflows/.github/workflows/mkdocs_build.yml@1.0.1
-    needs: [build_doxygen]
-    with:
-      image: ghcr.io/${{ github.repository }}:ci
-      doxygen: true
+      - uses: actions/cache@v3
+        with:
+          key: mkdocs-material-${{ env.cache_id }}
+          path: .cache
+          restore-keys: |
+            mkdocs-material-
+      - run: pip install mkdocs-material mkdocs-exclude mkdocstrings
+      - run: mkdocs gh-deploy --force

.github/workflows/run_tests.yml

@@ -0,0 +1,36 @@
+name: 🧪 Build and test
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      # Relies on the master branch built docker image for build-deps
+      - name: Start Docker Compose & build
+        run: cd docker && docker-compose up -d
+
+      # Copy Underpass library
+      - name: Copy library
+        run: docker-compose -f docker-compose.yml exec -T underpass sh -c "cp /code/build/.libs/libunderpass.so /usr/lib"
+
+      # Build and run tests
+      - name: Build and run tests 
+        run: |
+          docker-compose -f docker-compose.yml exec -T underpass sh -c "cd /code/build && make check -j `nproc`"
+          exit_code=$?
+          if [ $exit_code -ne 0 ]; then
+            echo "Test failed with exit code $exit_code"
+            exit $exit_code
+          fi
+

docker-compose.yml

@@ -54,8 +54,6 @@ services:
     volumes:
       - ./replication:/code/build/replication
   #   - ./:/code
-    depends_on:
-      - postgis
     networks:
       internal:
 

docs/Doxyfile → docs/Doxyfile.in

@@ -58,7 +58,7 @@ PROJECT_LOGO           =
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = apidocs
+OUTPUT_DIRECTORY       =
 
 # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
 # directories (in 2 levels) under the output directory of each output format and