Skip to content

Commit

Permalink
Merge pull request #77 from IGNF/develop
Browse files Browse the repository at this point in the history
Update master to 2.1.1
  • Loading branch information
lgrd committed May 5, 2023
2 parents 90a78f6 + a2502bc commit 82005d7
Show file tree
Hide file tree
Showing 243 changed files with 18,136 additions and 7,644 deletions.
46 changes: 46 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
---
name: Bug report
about: Create a report to help us improve Road2
title: ''
labels: bug
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**Type of use (choose between):**
- `service` provided by Road2 (ex. bug with a request from the API simple/1.0.0)
- `administration` of the services provided by Road2
- `other`, please add a helpful description

**Type of bug (choose between):**
- `request`, for bugs with an API
- `load`, for bugs during the creation of the server
- `checkConfig`, for bugs with this option

**To Reproduce**
Steps to reproduce the behavior:
1. Load server with this configuration
2. Request the server

**Expected behavior**
A clear and concise description of what you expected to happen.

**Environment (please complete the following information):**
- OS: [e.g. Debian]
- OS Version: [e.g. 11]
- Node version: [e.g. 16]
- Road2 commit: [sha]

**Configuration:**
- the configuration was generated inside the docker image: [eg. yes/no]
- if no, please, provide us the any differences you find useful

**Data:**
Type of data: [eg. osrm, pgrouting, valhalla]
Generation of the data: [eg. docker image of route-graph-generator, other]

**Additional context**
Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
69 changes: 69 additions & 0 deletions .github/workflows/docker_publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
name: Docker GitHub Container Registry

# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

on:
push:
branches: [ "master" ]
# Publish semver tags as releases.
tags: [ '*.*.*' ]
pull_request:
branches: [ "master", "develop" ]

env:
# Use docker.io for Docker Hub if empty
REGISTRY: ghcr.io
# github.repository as <account>/<repo>
IMAGE_NAME: ${{ github.repository }}


jobs:
build:

runs-on: ubuntu-latest
permissions:
contents: read
packages: write

steps:
- name: Checkout repository
uses: actions/checkout@v3

# Workaround: https://github.com/docker/build-push-action/issues/461
- name: Setup Docker buildx
uses: docker/setup-buildx-action@v2

# Login against a Docker registry except on PR
# https://github.com/docker/login-action
- name: Log into registry ${{ env.REGISTRY }}
if: github.event_name != 'pull_request'
uses: docker/login-action@v2
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

# Extract metadata (tags, labels) for Docker
# https://github.com/docker/metadata-action
- name: Extract Docker metadata
id: meta
uses: docker/metadata-action@v3
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

# Build and push Docker image with Buildx (don't push on PR)
# https://github.com/docker/build-push-action
- name: Build and push Docker image
id: build-and-push
uses: docker/build-push-action@v3
with:
context: .
file: ./docker/distributions/debian/Dockerfile
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
68 changes: 68 additions & 0 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
# Simple workflow for deploying static content to GitHub Pages
name: Deploy static content to Pages

on:
# Runs on pushes targeting the default branch
push:
branches: ["master"]
pull_request:
branches: [ "master", "develop" ]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write

# Allow one concurrent deployment
concurrency:
group: "pages"
cancel-in-progress: true

env:
PYTHON_VERSION: "3.10"

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: ${{ env.PYTHON_VERSION }}
cache: "pip"
cache-dependency-path: "requirements/*.txt"

- name: Install documentation requirements
run: |
python -m pip install -U -r requirements/documentation.txt
- name: Build doc using Sphinx
run: sphinx-build -b html -j auto -d documentation/_build/cache -q documentation documentation/_build/html


- name: Setup Pages
uses: actions/configure-pages@v2

- name: Upload artifact
uses: actions/upload-pages-artifact@v1
with:
path: 'documentation/_build/html'

deploy:
if: github.event_name != 'pull_request'
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
needs: build
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v1
13 changes: 12 additions & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,25 @@
"configurations": [

{
"name": "Docker: Attach to Node",
"name": "Docker: Attach to Road2 Administrator",
"type": "node",
"request": "attach",
"port": 9229,
"address": "localhost",
"protocol": "inspector",
"localRoot": "${workspaceFolder}",
"remoteRoot": "/home/docker/app/"
},
{
"name": "Docker: Attach to Road2 Service",
"type": "node",
"request": "attach",
"port": 9230,
"address": "localhost",
"protocol": "inspector",
"localRoot": "${workspaceFolder}",
"remoteRoot": "/home/docker/app/"
}

]
}

0 comments on commit 82005d7

Please sign in to comment.