forked from pietervdvn/MapComplete
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add binoculars theme, auto reformat everything
- Loading branch information
1 parent
38dea80
commit 78d6482
Showing
586 changed files
with
114,803 additions
and
111,072 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,27 +1,25 @@ | ||
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at: | ||
// https://github.com/microsoft/vscode-dev-containers/tree/v0.187.0/containers/typescript-node | ||
{ | ||
"name": "MapComplete", | ||
"build": { | ||
"dockerfile": "Dockerfile", | ||
// Update 'VARIANT' to pick a Node version: 12, 14, 16 | ||
"args": { | ||
"VARIANT": "14" | ||
} | ||
}, | ||
"name": "MapComplete", | ||
"build": { | ||
"dockerfile": "Dockerfile", | ||
// Update 'VARIANT' to pick a Node version: 12, 14, 16 | ||
"args": { | ||
"VARIANT": "14" | ||
} | ||
}, | ||
// Set *default* container specific settings.json values on container create. | ||
"settings": {}, | ||
// Add the IDs of extensions you want installed when the container is created. | ||
"extensions": [], | ||
// Use 'forwardPorts' to make a list of ports inside the container available locally. | ||
"forwardPorts": [ | ||
1234 | ||
], | ||
// Use 'postCreateCommand' to run commands after the container is created. | ||
//"postCreateCommand": "npm run init", | ||
|
||
// Set *default* container specific settings.json values on container create. | ||
"settings": {}, | ||
|
||
// Add the IDs of extensions you want installed when the container is created. | ||
"extensions": [], | ||
|
||
// Use 'forwardPorts' to make a list of ports inside the container available locally. | ||
"forwardPorts": [1234], | ||
|
||
// Use 'postCreateCommand' to run commands after the container is created. | ||
//"postCreateCommand": "npm run init", | ||
|
||
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. | ||
"remoteUser": "node" | ||
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. | ||
"remoteUser": "node" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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/[email protected] | ||
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 "[email protected]" | ||
git config --global user.name "pietervdvn" | ||
git clone --depth 1 --single-branch --branch master "https://x-access-token:[email protected]/pietervdvn/pietervdvn.github.io.git" | ||
echo "Destination repo is cloned" | ||
- name: "Copying files" | ||
run: | | ||
echo "Deploying" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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/[email protected] | ||
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: >- | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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/[email protected] | ||
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 "[email protected]" | ||
git config --global user.name "MapComplete" | ||
git clone --depth 1 --single-branch --branch main "https://x-access-token:[email protected]/MapComplete/mapcomplete.github.io.git" | ||
echo "Destination repo is cloned" | ||
- name: "Copying files" | ||
run: | | ||
echo "Deploying" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
{ | ||
"files.eol": "\n" | ||
"files.eol": "\n" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.