Skip to content

Commit 6804c2f

Browse files
chore: resolved merge conflict
2 parents 6216b58 + ba0c153 commit 6804c2f

13 files changed

Lines changed: 349 additions & 83 deletions

File tree

.github/workflows/frontend.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ on:
55
branches:
66
- develop
77
- main
8+
paths-ignore:
9+
- 'README.md'
10+
- 'codemeta.json'
11+
- 'CITATION.cff'
12+
- 'CHANGELOG.md'
13+
- 'docs/**'
814
workflow_dispatch:
915

1016
jobs:
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Update CITATION.cff from Codemeta
2+
3+
on:
4+
push:
5+
paths:
6+
- 'codemeta.json'
7+
workflow_dispatch: # enables manual triggers
8+
9+
jobs:
10+
convert:
11+
runs-on: ubuntu-latest
12+
permissions:
13+
contents: write # Needed to commit changes back to the repo
14+
15+
steps:
16+
- name: Checkout repository
17+
uses: actions/checkout@v4
18+
19+
- name: Run Codemeta Converter Action
20+
uses: kingsdigitallab/credits-tools@main
21+
with:
22+
codemeta-path: 'codemeta.json'
23+
cff-path: 'CITATION.cff'
24+
25+
- name: Check for changes and commit
26+
uses: stefanzweifel/git-auto-commit-action@v5
27+
with:
28+
commit_message: 'Auto-update CITATION.cff from codemeta.json'
29+
file_pattern: 'CITATION.cff'

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,3 +141,4 @@ dist
141141
# Temporary files
142142
_*
143143
/tmp
144+
data/petrography/compare-csv-headers.py

CITATION.cff

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
abstract: "Corpus building edition for the CROSSREADS research project known as I.Sicily
2+
- Inscriptions of Ancient Sicily. https://sicily.classics.ox.ac.uk/\nThe project
3+
workflow processes EpiDoc TEI XML files, enriches the original input corpus with
4+
multiple annotation layers, serve images and presents it on a static website with
5+
tools to search and visualise that data. Individual inscription editions are published
6+
as HTML pages but can also be searched and filtered, as well as being freely available
7+
for download."
8+
authors:
9+
- email: kdl-info@kcl.ac.uk
10+
name: King's Digital Lab
11+
- affiliation: King's Digital Lab, King's College London
12+
email: jose.m.vieira@kcl.ac.uk
13+
family-names: Vieira
14+
given-names: Miguel
15+
- affiliation: King's Digital Lab, King's College London
16+
email: zihao.lu@kcl.ac.uk
17+
family-names: Lu
18+
given-names: Zihao
19+
- affiliation: King's Digital Lab, King's College London
20+
email: arianna.ciula@kcl.ac.uk
21+
family-names: Ciula
22+
given-names: Arianna
23+
- affiliation: Faculty of Classics, University of Oxford
24+
email: jonathan.prag@merton.ox.ac.uk
25+
family-names: Prag
26+
given-names: Jonathan
27+
cff-version: 1.2.0
28+
date-released: '2026-06-02'
29+
identifiers:
30+
- description: Part of
31+
type: url
32+
value: https://sicily.classics.ox.ac.uk/
33+
keywords:
34+
- digital-epigraphy
35+
- inscriptions
36+
- sicily
37+
license: MIT
38+
message: If you use this software, please cite it using these metadata.
39+
repository-artifact: https://github.com/kingsdigitallab/corpus-building/releases
40+
repository-code: https://github.com/kingsdigitallab/corpus-building
41+
title: Corpus building edition
42+
type: software
43+
version: v0.27.2
44+

README.md

Lines changed: 18 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -93,34 +93,22 @@ You can also run tests for specific workspaces from the root:
9393
- `npm run test:frontend` — Run all frontend tests (unit + integration)
9494
- `npm run test:integration` — Run Playwright frontend integration/accessibility tests only
9595

96-
## Adding content to the site
97-
98-
See the [frontend README](frontend/README.md#adding-content) for instructions on
99-
how to add static pages to the site via markdown files.
100-
101-
## Editorial and release workflow
102-
103-
Changes to the content or code should normally happen on the `develop` branch.
104-
Any commit on that branch will automatically trigger a release to the **[staging/preview site](https://kingsdigitallab.github.io/corpus-building/)**.
105-
106-
Once the changes accumulated on the staging site are ready for public release
107-
they can be merged into the `main` branch by a developer or with [a new Pull Request](https://github.com/kingsdigitallab/corpus-building/compare/main...develop).
108-
Any update of that branch will automatically trigger a release to the Oxford **[public/live/production site](https://sicily.classics.ox.ac.uk/)** via SSH.
109-
110-
In both cases [the automated release process](https://github.com/kingsdigitallab/corpus-building/blob/main/.github/workflows/frontend.yml) from a modified branch first does the following:
111-
1. fetches the latest version of the TEI corpus from https://github.com/ISicily/ISicily
112-
2. run the ETL process from that corpus to rebuild the site metadata and indices
113-
3. run some automated tests and stops the release if they fail
114-
4. commit the updated metadata and indices to the branch
115-
116-
The release process may take up to 30 minutes to complete.
117-
[Current and past release workflows are visible on the Actions tab](https://github.com/kingsdigitallab/corpus-building/actions)
118-
of the repository.
119-
There can be a slight delay between the end of the action
120-
and the actual refresh of the content on the target site.
121-
Also note that [hard-refresh in your browser](https://www.wikihow.com/Force-Refresh-in-Your-Internet-Browser)
122-
may be needed to flush old, cached content.
96+
## Editorial and Release Workflows
97+
98+
More information about [Editorial and Release Workflows](docs/editorial-and-release-workflows.md).
99+
100+
## How to cite
101+
102+
```bibtex
103+
@software{King_s_Digital_Lab_and_Vieira_Corpus_building_edition_2026,
104+
author = {{King's Digital Lab} and Vieira, Miguel and Lu, Zihao and Ciula, Arianna and Prag, Jonathan},
105+
license = {MIT},
106+
month = jun,
107+
title = {{Corpus building edition}},
108+
url = {https://github.com/kingsdigitallab/corpus-building},
109+
version = {v0.27.2},
110+
year = {2026}
111+
}
112+
```
123113

124-
Small **hot fixes** to the code or content of the live site can be done
125-
with a Pull Request directly on the `main` branch.
126-
In that situation extra care should be taken when verifying the changes.
114+
(Generated from codemeta.json)

codemeta.json

Lines changed: 59 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
{
22
"@context": "https://w3id.org/codemeta/3.0",
3+
"@type": [
4+
"SoftwareSourceCode",
5+
"SoftwareApplication"
6+
],
37
"applicationCategory": "Digital Epigraphy",
48
"author": [
59
{
10+
"email": "kdl-info@kcl.ac.uk",
611
"name": "King's Digital Lab",
712
"@id": "https://github.com/kingsdigitallab",
813
"@type": "Organization"
@@ -12,6 +17,7 @@
1217
"name": "King's Digital Lab, King's College London",
1318
"@type": "Organization"
1419
},
20+
"email": "jose.m.vieira@kcl.ac.uk",
1521
"familyName": "Vieira",
1622
"givenName": "Miguel",
1723
"@id": "_:author_2",
@@ -22,6 +28,7 @@
2228
"name": "King's Digital Lab, King's College London",
2329
"@type": "Organization"
2430
},
31+
"email": "zihao.lu@kcl.ac.uk",
2532
"familyName": "Lu",
2633
"givenName": "Zihao",
2734
"@id": "_:author_3",
@@ -32,6 +39,7 @@
3239
"name": "King's Digital Lab, King's College London",
3340
"@type": "Organization"
3441
},
42+
"email": "arianna.ciula@kcl.ac.uk",
3543
"familyName": "Ciula",
3644
"givenName": "Arianna",
3745
"@id": "_:author_4",
@@ -42,6 +50,7 @@
4250
"name": "Faculty of Classics, University of Oxford",
4351
"@type": "Organization"
4452
},
53+
"email": "jonathan.prag@merton.ox.ac.uk",
4554
"familyName": "Prag",
4655
"givenName": "Jonathan",
4756
"@id": "_:author_5",
@@ -52,7 +61,7 @@
5261
"dateCreated": "2024-07-02",
5362
"dateModified": "2026-06-04",
5463
"datePublished": "2026-06-02",
55-
"description": "Corpus building edition for the CROSSREADS research project. https://sicily.classics.ox.ac.uk/",
64+
"description": "Corpus building edition for the CROSSREADS research project known as I.Sicily - Inscriptions of Ancient Sicily. https://sicily.classics.ox.ac.uk/\nThe project workflow processes EpiDoc TEI XML files, enriches the original input corpus with multiple annotation layers, serve images and presents it on a static website with tools to search and visualise that data. Individual inscription editions are published as HTML pages but can also be searched and filtered, as well as being freely available for download.",
5665
"downloadUrl": "https://github.com/kingsdigitallab/corpus-building/releases",
5766
"funder": {
5867
"name": "ERC",
@@ -72,29 +81,58 @@
7281
"xslt"
7382
],
7483
"softwareRequirements": [
75-
"sveltekit",
76-
"mdsvex",
77-
"fontsource/source-sans-pro",
78-
"itemsjs",
79-
"flexsearch",
80-
"leaflet",
81-
"maplibre-gl",
82-
"openseadragon",
83-
"saxon-js",
84-
"xml2js",
85-
"csv-parse",
86-
"vitest"
84+
{
85+
"name": "sveltekit",
86+
"@type": "SoftwareApplication"
87+
},
88+
{
89+
"name": "mdsvex",
90+
"@type": "SoftwareApplication"
91+
},
92+
{
93+
"name": "fontsource/source-sans-pro",
94+
"@type": "SoftwareApplication"
95+
},
96+
{
97+
"name": "itemsjs",
98+
"@type": "SoftwareApplication"
99+
},
100+
{
101+
"name": "flexsearch",
102+
"@type": "SoftwareApplication"
103+
},
104+
{
105+
"name": "leaflet",
106+
"@type": "SoftwareApplication"
107+
},
108+
{
109+
"name": "maplibre-gl",
110+
"@type": "SoftwareApplication"
111+
},
112+
{
113+
"name": "openseadragon",
114+
"@type": "SoftwareApplication"
115+
},
116+
{
117+
"name": "saxon-js",
118+
"@type": "SoftwareApplication"
119+
},
120+
{
121+
"name": "xml2js",
122+
"@type": "SoftwareApplication"
123+
},
124+
{
125+
"name": "csv-parse",
126+
"@type": "SoftwareApplication"
127+
},
128+
{
129+
"name": "vitest",
130+
"@type": "SoftwareApplication"
131+
}
87132
],
88133
"version": "v0.27.2",
89-
"codemeta:contIntegration": {
90-
"@id": "https://raw.githubusercontent.com/kingsdigitallab/corpus-building/develop/.github/workflows/frontend.yml"
91-
},
92134
"continuousIntegration": "https://raw.githubusercontent.com/kingsdigitallab/corpus-building/develop/.github/workflows/frontend.yml",
93135
"developmentStatus": "inactive",
94136
"funding": "Advanced Grant CROSSREADS (grant agreement no.885040)",
95-
"isSourceCodeOf": "CROSSREADS Corpus Building Edition",
96-
"@type": [
97-
"SoftwareSourceCode",
98-
"SoftwareApplication"
99-
]
137+
"isSourceCodeOf": "CROSSREADS Corpus Building Edition"
100138
}
Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
## Adding content to the site
2+
3+
See the [frontend README](../frontend/README.md#adding-content)
4+
for instructions on how to add static pages to the site via markdown files.
5+
6+
## Importing the petrographic metadata
7+
8+
See [the petrographic import documentation](./petrographic-import.md)
9+
for details.
10+
11+
## Editorial and release workflow
12+
13+
Changes to the content or code should normally happen on the `develop` branch.
14+
Any commit on that branch will automatically trigger a release
15+
to the **[staging/preview site](https://kingsdigitallab.github.io/corpus-building/)**.
16+
17+
Once the changes accumulated on the staging site are ready for public release
18+
they can be merged dierectly into the `main` branch by a developer.
19+
Alternatively non-developers can create
20+
[a new Pull Request](https://github.com/kingsdigitallab/corpus-building/compare/main...develop)
21+
to be reviewed and merged by someone else.
22+
23+
Any update of the `main` branch will automatically trigger a release
24+
via SSH to the **[public/live/production site](https://sicily.classics.ox.ac.uk/)**
25+
hosted on Oxford server.
26+
27+
### Automated release process
28+
29+
In both cases
30+
[the automated release process](https://github.com/kingsdigitallab/corpus-building/blob/main/.github/workflows/frontend.yml)
31+
from a modified branch first does the following:
32+
1. fetches the latest version of the TEI corpus from https://github.com/ISicily/ISicily
33+
2. run the ETL process from that corpus to rebuild the site metadata and indices
34+
3. run some automated tests and stops the release if any fails
35+
4. commit the updated metadata and indices to the branch
36+
37+
The release process may take up to 30 minutes to complete.
38+
[Current and past release workflows are visible on the Actions tab](https://github.com/kingsdigitallab/corpus-building/actions)
39+
of the repository.
40+
There can be a slight delay between the end of the action
41+
and the actual refresh of the content on the target site.
42+
Also note that [hard-refresh in your browser](https://www.wikihow.com/Force-Refresh-in-Your-Internet-Browser)
43+
may be needed to flush old, cached content.
44+
45+
### Hot fixes
46+
47+
Small **[hot fixes](https://en.wikipedia.org/wiki/Hotfix)**
48+
to the code or content of the live site can be done
49+
with a Pull Request directly on the `main` branch.
50+
In that situation extra care should be taken when verifying the changes.
51+
52+
### Changes to the corpus
53+
54+
Although the automated release process pulls [the latest version
55+
of the TEI corpus from the `main` branch of the ISicily repository](https://github.com/ISicily/ISicily/tree/master/inscriptions),
56+
only changes in the code of this repository will trigger the process.
57+
58+
If you only want to update the metadata about the TEI corpus on a site
59+
(staging or production) then you can manually trigger the release process
60+
by following those steps:
61+
1. go to the [Build and deploy workflow](https://github.com/kingsdigitallab/corpus-building/actions/workflows/frontend.yml) on the Corpus Building repository;
62+
2. click the "Run workflow" dropdown on the right,, just above the table;
63+
3. select the relevant branch (`main` for live site, `develop` for staging site);
64+
4. confirm by clicking the "Run workflow" button
65+
66+
<img width="932" height="544" alt="Screenshot_20260805_121747" src="https://github.com/user-attachments/assets/221f1737-18c7-40c0-8ab0-d2ef80a112ba" />
67+
68+
You should be redirected to a new page for that release job
69+
where you can see its running status in real time.
70+
You'll notice a "Cancel workflow" button in the top right corner
71+
to interrupt the job. You can't resume a cancelled job;
72+
instead you would run a new one.
73+
74+
<img width="1139" height="736" alt="Screenshot_20260805_121201" src="https://github.com/user-attachments/assets/153dcc5e-3b27-4399-8f2a-25ba2d3e3555" />
75+
76+
You can also see all the current and past jobs on the
77+
[Build and deploy workflow](https://github.com/kingsdigitallab/corpus-building/actions/workflows/frontend.yml) page.
78+
The color of the icon in fron of each row indicates the status of the job:
79+
animated orange is curently running; blue tick was successful;
80+
red cross failed; and greyed was cancelled.
81+
82+
<img width="932" height="757" alt="Screenshot_20260805_121318" src="https://github.com/user-attachments/assets/d4ca61e3-2814-4647-b20d-72f907de5b22" />

0 commit comments

Comments
 (0)