Merge branch 'master' into 0485-contentstate-canvas-region

Author: giacomomarchioro

.github/workflows/live.yml

@@ -48,33 +48,6 @@ jobs:
    # - name: Test *iiif.io* links
    #   run: bundle exec rake test:links:iiif
 
-    # Validate
-    - name: Set up Python 3.x
-      uses: actions/setup-python@v5
-      with:
-        # Semantic version range syntax or exact version of a Python version
-        python-version: '3.x' 
-        # Optional - x64 or x86 architecture, defaults to x64
-        architecture: 'x64' 
-    - name: Cache pip
-      uses: actions/cache@v4
-      with:
-        # This path is specific to Ubuntu
-        path: ~/.cache/pip
-        # Look to see if there is a cache hit for the corresponding requirements file
-        key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-          ${{ runner.os }}-
-
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install -r scripts/requirements.txt
-
-    - name: validate      
-      run: scripts/validate.sh
-
     # Deploy to preview site
     - name: Create GitHub deployment
       uses: glenrobson/deployments@v0.4.2

.github/workflows/preview.yml

@@ -46,33 +46,6 @@ jobs:
     - name: Test *iiif.io* links
       run: bundle exec rake test:links:iiif
 
-    # Validate
-    - name: Set up Python 3.x
-      uses: actions/setup-python@v5
-      with:
-        # Semantic version range syntax or exact version of a Python version
-        python-version: '3.x' 
-        # Optional - x64 or x86 architecture, defaults to x64
-        architecture: 'x64' 
-    - name: Cache pip
-      uses: actions/cache@v4
-      with:
-        # This path is specific to Ubuntu
-        path: ~/.cache/pip
-        # Look to see if there is a cache hit for the corresponding requirements file
-        key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-          ${{ runner.os }}-
-
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install -r scripts/requirements.txt
-
-    - name: validate      
-      run: scripts/validate.sh
-
     - name: add URL to config
       run: .github/bin/addURL.sh
 

.github/workflows/validate.yml

@@ -0,0 +1,34 @@
+name: validate
+
+on:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  validate:
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_WITH: test jekyll_plugins
+      SITE_ID:  'cookbook' # which iiif site this is
+      URL: 'https://preview.iiif.io'
+
+    steps:
+      - name: Check out this repository
+        uses: actions/checkout@v5
+
+      # Setup ruby and build site
+      - name: Setup ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+
+      - name: add URL to config
+        run: .github/bin/addURL.sh
+
+      - name: Build site
+        run: bundle exec rake build:preview
+
+      - name: Run IIIF validator
+        uses: IIIF/presentation-validator@main
+        with:
+          directory: _site/cookbook/HEAD/recipe

recipe/0057-publishing-v2-and-v3/manifest-v2.json

@@ -12,6 +12,7 @@
         {
           "@id": "{{ id.path }}/canvas/p1",
           "@type": "sc:Canvas",
+          "label": "p. 1",
           "height": 1800,
           "width": 1200,
           "images": [