forked from MapComplete/MapComplete
Add binoculars theme, auto reformat everything
This commit is contained in:
parent
38dea806c5
commit
78d6482c88
586 changed files with 115573 additions and 111842 deletions
9
.github/pull_request_template.md
vendored
9
.github/pull_request_template.md
vendored
|
@ -1,9 +1,8 @@
|
|||
|
||||
Opening a pull request on MapComplete
|
||||
=====================================
|
||||
|
||||
Hey! Thanks for opening a pull request on Mapcomplete! This probably means you want to add a new theme - if so, please follow the checklist below.
|
||||
If this pull request is for some other issue, please ignore the template.
|
||||
Hey! Thanks for opening a pull request on Mapcomplete! This probably means you want to add a new theme - if so, please
|
||||
follow the checklist below. If this pull request is for some other issue, please ignore the template.
|
||||
|
||||
Adding your new theme
|
||||
---------------------
|
||||
|
@ -14,4 +13,6 @@ To making merging smooth, please make sure that each of the following conditions
|
|||
|
||||
- [ ] The codebase is GPL-licensed. By opening a pull request, the new theme will be GPL too
|
||||
- [ ] All images are included in the pull request and no images are loaded from an external service (e.g. Wikipedia)
|
||||
- [ ] The [guidelines on how to make your own theme](https://github.com/pietervdvn/MapComplete/blob/master/Docs/Making_Your_Own_Theme.md) are read and followed
|
||||
- [ ]
|
||||
The [guidelines on how to make your own theme](https://github.com/pietervdvn/MapComplete/blob/master/Docs/Making_Your_Own_Theme.md)
|
||||
are read and followed
|
20
.github/workflows/deploy_pietervdvn.yml
vendored
20
.github/workflows/deploy_pietervdvn.yml
vendored
|
@ -1,42 +1,42 @@
|
|||
name: Deployment on pietervdvn
|
||||
on:
|
||||
push
|
||||
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
|
||||
- name: Set up Node.js
|
||||
uses: actions/setup-node@v1.2.0
|
||||
with:
|
||||
node-version: '15'
|
||||
node-version: '15'
|
||||
env:
|
||||
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
|
||||
|
||||
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
|
||||
|
||||
- name: install deps
|
||||
run: npm ci
|
||||
|
||||
|
||||
- name: create generated dir
|
||||
run: mkdir ./assets/generated
|
||||
|
||||
- name: create stub themes
|
||||
run: "echo '{\"layers\": [], \"themes\": []}' > ./assets/generated/known_layers_and_themes.json"
|
||||
|
||||
|
||||
- name: Prepare deploy
|
||||
run: npm run prepare-deploy
|
||||
|
||||
|
||||
- name: Clone deployment repo
|
||||
env:
|
||||
DEPLOY_KEY_PIETERVDVN: ${{ secrets.DEPLOY_KEY_PIETERVDVN }}
|
||||
run: |
|
||||
run: |
|
||||
echo "Cloning destination repo"
|
||||
git config --global user.email "pietervdvn@posteo.net"
|
||||
git config --global user.name "pietervdvn"
|
||||
git clone --depth 1 --single-branch --branch master "https://x-access-token:$DEPLOY_KEY_PIETERVDVN@github.com/pietervdvn/pietervdvn.github.io.git"
|
||||
echo "Destination repo is cloned"
|
||||
|
||||
|
||||
- name: "Copying files"
|
||||
run: |
|
||||
echo "Deploying"
|
||||
|
|
26
.github/workflows/pull_request_check.yml
vendored
26
.github/workflows/pull_request_check.yml
vendored
|
@ -1,38 +1,38 @@
|
|||
name: Pull request check
|
||||
on:
|
||||
pull_request_target:
|
||||
types: [opened, edited, synchronize, ready_for_review, review_requested]
|
||||
types: [ opened, edited, synchronize, ready_for_review, review_requested ]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
|
||||
- uses: actions/checkout@v2
|
||||
- name: Set up Node.js
|
||||
uses: actions/setup-node@v1.2.0
|
||||
env:
|
||||
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
|
||||
|
||||
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
|
||||
|
||||
- name: install deps
|
||||
run: npm ci
|
||||
|
||||
|
||||
- name: create generated dir
|
||||
run: mkdir ./assets/generated
|
||||
|
||||
- name: create stub themes
|
||||
run: "echo '{\"layers\": [], \"themes\": []}' > ./assets/generated/known_layers_and_themes.json"
|
||||
|
||||
|
||||
- name: generate translations
|
||||
run: npm run generate:translations
|
||||
|
||||
|
||||
- name: Compile license info
|
||||
run: npm run generate:licenses
|
||||
|
||||
|
||||
- name: Compile and validate themes and layers
|
||||
run: npm run validate:layeroverview
|
||||
|
||||
run: npm run validate:layeroverview
|
||||
|
||||
- name: Validate license info
|
||||
run: npm run validate:licenses
|
||||
|
||||
|
@ -45,10 +45,10 @@ jobs:
|
|||
else
|
||||
echo "VALIDATION_FAILED=false" >> $GITHUB_ENV
|
||||
fi
|
||||
|
||||
|
||||
- name: Test variable
|
||||
run: echo "${{ env.VALIDATION_FAILED }}"
|
||||
|
||||
|
||||
- name: Archive reports
|
||||
uses: actions/upload-artifact@v2
|
||||
if: >-
|
||||
|
@ -58,7 +58,7 @@ jobs:
|
|||
path: |
|
||||
layer_report.txt
|
||||
missing_licenses.txt
|
||||
|
||||
|
||||
- name: Comment PR
|
||||
uses: allthatjazzleo/actions-pull-request-add-comment@master
|
||||
if: >-
|
||||
|
|
|
@ -3,42 +3,42 @@ on:
|
|||
push:
|
||||
branches:
|
||||
- master
|
||||
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
|
||||
- name: Set up Node.js
|
||||
uses: actions/setup-node@v1.2.0
|
||||
with:
|
||||
node-version: '15'
|
||||
node-version: '15'
|
||||
env:
|
||||
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
|
||||
|
||||
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
|
||||
|
||||
- name: install deps
|
||||
run: npm ci
|
||||
|
||||
|
||||
- name: create generated dir
|
||||
run: mkdir ./assets/generated
|
||||
|
||||
- name: create stub themes
|
||||
run: "echo '{\"layers\": [], \"themes\": []}' > ./assets/generated/known_layers_and_themes.json"
|
||||
|
||||
|
||||
- name: Prepare deploy
|
||||
run: npm run prepare-deploy
|
||||
|
||||
|
||||
- name: Clone deployment repo
|
||||
env:
|
||||
DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}
|
||||
run: |
|
||||
run: |
|
||||
echo "Cloning destination repo"
|
||||
git config --global user.email "pietervdvn@posteo.net"
|
||||
git config --global user.name "MapComplete"
|
||||
git clone --depth 1 --single-branch --branch main "https://x-access-token:$DEPLOY_KEY@github.com/MapComplete/mapcomplete.github.io.git"
|
||||
echo "Destination repo is cloned"
|
||||
|
||||
|
||||
- name: "Copying files"
|
||||
run: |
|
||||
echo "Deploying"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue