Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add in merge checks #342

Merged
merged 4 commits into from
Apr 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions .github/workflows/merge-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: Merge Check

"on":
pull_request:
branches:
- "main"

# Cancel any in-flight jobs
concurrency:
group: ${{ github.ref }}
cancel-in-progress: true

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3

- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: "3.10"
cache: pipenv

- name: Install Python dependencies
run: |
pip install pipenv
# pipenv install
pipenv sync

- name: Run DVC pipelines
run: |
pipenv run dvc --version
pipenv run dvc update -R working
pipenv run dvc repro -R scripts

- name: Setup Deno
uses: denoland/setup-deno@v1
with:
deno-version: v1.x

- name: Build site
shell: bash
run: deno task build
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,8 @@ design/data/
__pycache__
/MM23_variable_lookup.csv
.env

# Debugging files
*.cpuprofile
*.heapprofile
*.heapsnapshot
21 changes: 21 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"request": "launch",
"name": "Debug site",
"type": "node",
// "program": "${workspaceFolder}/main.ts",
"cwd": "${workspaceFolder}",
"runtimeExecutable": "/home/giles/.deno/bin/deno",
"runtimeArgs": [
"task",
"lume_debug",
],
"attachSimplePort": 9229
}
]
}
2 changes: 1 addition & 1 deletion _config.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ site.use(date({
}));

// Add csv loader
site.loadData(['.csv'], csvLoader);
site.loadData(['.csv'], csvLoader());
site.loadData(['.geojson', '.hexjson'], jsonLoader);
site.loadData(['.md']);

Expand Down
3 changes: 2 additions & 1 deletion deno.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"lume": "echo \"import 'lume/cli.ts'\" | deno run --v8-flags=--max-old-space-size=2048 --unstable -A -",
"build": "deno task lume",
"serve": "deno task lume -s",
"validate": "deno run --allow-env --allow-read=src/_data/reports --allow-write=lib lib/validate.ts"
"validate": "deno run --allow-env --allow-read=src/_data/reports --allow-write=lib lib/validate.ts",
"lume_debug": "echo \"import 'lume/cli.ts'\" | deno run --inspect-wait --v8-flags=--max-old-space-size=2048 --allow-all -"
},
"lock": false,
"compilerOptions": {
Expand Down
2 changes: 1 addition & 1 deletion import_map.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"lume/": "https://deno.land/x/[email protected]/",
"local/": "./local-lib/",
"std/": "https://deno.land/[email protected]/",
"oi-lume-utils/": "https://deno.land/x/oi_lume_utils@v0.3.1/"
"oi-lume-utils/": "https://deno.land/x/oi_lume_utils@v0.4.0/"
}
}
Loading