Merge branch 'develop' into cleanup-html-generation

Materials-Consortia · Mar 22, 2024 · 0c910f2 · 0c910f2
2 parents d6cb023 + 4c77f97
commit 0c910f2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - develop
+  workflow_dispatch:
 
 jobs:
 
@@ -16,9 +17,9 @@ jobs:
 
     steps:
 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: '3.10'
 
@@ -35,17 +36,18 @@ jobs:
 
     - name: Commit to gh-pages
       run: |
+        git fetch origin gh-pages
         git checkout gh-pages
-        git add optimade.html
         mkdir -p specification/develop
         mv optimade.html specification/develop/index.html
+        git add specification/develop/index.html
         git commit -m "Deploy develop specification to GitHub Pages: ${SHA}"
         if git diff --cached --quiet; then
             exit 0
         fi
 
     - name: Push changes
-      uses: ad-m/github-push-action@v0.6.0
+      uses: ad-m/github-push-action@v0.8.0
       with:
         branch: gh-pages
         force: true

diff --git a/optimade.rst b/optimade.rst
@@ -2358,11 +2358,11 @@ The format described in this subsection forms a subset of the `JSON Schema Valid
 
 - :field:`examples`: List.
   A list of example values that the defined property can have.
-  These examples MUST all be of a data type that matches the :field:`type` field and otherwise adhere to the rest of the Property Description.
+  These examples MUST all be of a data type that matches the :field:`type` field and otherwise adhere to the rest of the Property Definition.
 
 - :field:`enum`: List.
   The defined property MUST take one of the values given in the provided list.
-  The items in the list MUST all be of a data type that matches the :field:`type` field and otherwise adhere to the rest of the Property Description.
+  The items in the list MUST all be of a data type that matches the :field:`type` field and otherwise adhere to the rest of the Property Definition.
   If this key is given, for :val:`null` to be a valid value of the defined property, the list MUST contain a :val:`null` value and the :field:`type` MUST be a list where the second value is the string :val:`"null"`.
 
 Furthermore, depending on what string the :field:`type` is equal to, or contains as first element, the following additional requirements also apply: