From fdc5edd8e425f5c44bf11c9bf8372d4b00143199 Mon Sep 17 00:00:00 2001 From: James Date: Tue, 3 Jan 2023 15:17:22 +0000 Subject: [PATCH 1/3] datatig: Use datetype field types --- datatig.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datatig.yaml b/datatig.yaml index e4ab6110..fd7a51a4 100644 --- a/datatig.yaml +++ b/datatig.yaml @@ -94,7 +94,7 @@ types: - id: meta_lastUpdated key: meta/lastUpdated title: Meta - Last updated - #type: datetime + type: datetime - id: links_opencorporates key: links/opencorporates title: Links - Open Corporates From ff047bfe368001014447bb2ff2e6c1a95764402c Mon Sep 17 00:00:00 2001 From: James Date: Tue, 3 Jan 2023 15:21:12 +0000 Subject: [PATCH 2/3] Netlify & Datatig: Build versioned site too --- netlify.sh | 20 ++++++++++++++++++++ netlify.toml | 3 +-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100755 netlify.sh diff --git a/netlify.sh b/netlify.sh new file mode 100755 index 00000000..7b615ec5 --- /dev/null +++ b/netlify.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +set -e + +git remote add origin https://github.com/org-id/register.git || true + +git fetch + +pip install datatig + +export PYTHONPATH=$(pwd) + +echo "Building site ..." +python -m datatig.cli build . --staticsiteoutput out + +if [ "$HEAD" != "main" ] +then + echo "Building versioned site ..." + python -m datatig.cli versionedbuild --staticsiteoutput out/versioned --staticsiteurl /versioned --refs origin/main,origin/$HEAD --defaultref origin/main . || true +fi diff --git a/netlify.toml b/netlify.toml index be4d443b..ed5025a2 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,4 +1,3 @@ [build] publish = "out" - command = "pip install datatig && export PYTHONPATH=$(pwd) && python -m datatig.cli build . --staticsiteoutput out" - + command = "./netlify.sh" From 1171bcdc21f63ebdd7fbb076ea315a2f50000ad4 Mon Sep 17 00:00:00 2001 From: James Date: Tue, 3 Jan 2023 17:10:14 +0000 Subject: [PATCH 3/3] GitHub Actions: Update Python version --- .github/workflows/check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index b0957548..efd66b03 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -9,7 +9,7 @@ jobs: - name: Setup python uses: actions/setup-python@v2 with: - python-version: 3.6 + python-version: 3.11 architecture: x64 - run: pip install datatig