Merge branch 'main' into ci/auto-merge-dependabot

Author: ralfhandl

.github/workflows/agenda.yaml

@@ -3,8 +3,8 @@ name: Create meeting template
 on:
   workflow_dispatch: {}
   schedule:
-    # every two weeks on tuesday at 10AM PST (with DST)
-    - cron: '0 17 */14 * 2'
+    # every week on tuesday at 10AM PST (with DST)
+    - cron: '0 17 * * 2'
 
 jobs:
   create-discussion:
@@ -13,18 +13,34 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v5
+      - name: Check if it's an alternate week
+        id: check-week
+        run: |
+          # Get ISO week number (1-53)
+          WEEK_NUMBER=$(date +%V)
+          # Check if week number is odd or even to run workflow and create agenda for next week's meeting
+          if [ $((WEEK_NUMBER % 2)) -eq 0 ]; then
+            echo "Should run this week (even week: $WEEK_NUMBER)"
+            echo "should_run=true" >> $GITHUB_OUTPUT
+          else
+            echo "Skipping odd week: $WEEK_NUMBER"
+            echo "should_run=false" >> $GITHUB_OUTPUT
+          fi
       - name: Get agenda text from template
+        if: steps.check-week.outputs.should_run == 'true'
         id: get-agenda
         run: |
           echo 'AGENDA<<EOF' >> $GITHUB_ENV
           cat .github/templates/agenda.md >> $GITHUB_ENV
           echo 'EOF' >> $GITHUB_ENV
       - name: Get Next Meeting Date
+        if: steps.check-week.outputs.should_run == 'true'
         id: get-next-meeting-date
         run: |
           NEXT_MEETING_DATE=$(date -d "next Tuesday" +%Y-%m-%d)
           echo "NEXT_MEETING_DATE=$NEXT_MEETING_DATE" >> $GITHUB_ENV
       - name: Create discussion with agenda
+        if: steps.check-week.outputs.should_run == 'true'
         id: create-repository-discussion
         uses: octokit/[email protected]
         env:

.github/workflows/respec.yaml

@@ -39,7 +39,7 @@ jobs:
 
       - uses: actions/setup-node@v6 # setup Node.js
         with:
-          node-version: "20.x"
+          node-version: "22.x"
 
       - name: Install dependencies
         run: npm ci

.github/workflows/schema-publish.yaml

@@ -15,6 +15,7 @@ on:
 
 jobs:
   publish:
+    if: github.repository == 'OAI/Overlay-Specification'
     runs-on: ubuntu-latest
 
     steps:
@@ -33,7 +34,7 @@ jobs:
 
       - uses: actions/setup-node@v6 # setup Node.js
         with:
-          node-version: 20.x
+          node-version: "22.x"
 
       - name: Install dependencies
         run: npm ci

.github/workflows/schema-tests.yaml

@@ -8,30 +8,28 @@ name: schema-tests
 # testcases for the metaschemas
 #
 
-# run this on push to any branch and creation of pull-requests
-on: 
-  push: {}
+# run this on pull-requests (creation and updates) and on manual trigger
+on:
   pull_request: {}
   workflow_dispatch: {}
 
 jobs:
   test:
-
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v5 # checkout repo content
-      with:
-        fetch-depth: 0
+      - uses: actions/checkout@v5 # checkout repo content
+        with:
+          fetch-depth: 0
 
-    - uses: actions/setup-node@v6 # setup Node.js
-      with:
-        node-version: '20.x'
+      - uses: actions/setup-node@v6 # setup Node.js
+        with:
+          node-version: "22.x"
 
-    - name: Install dependencies from main
-      run: |
-        # git checkout remotes/origin/main -- package.json package-lock.json #TODO: uncomment with subsequent PR
-        npm ci
+      - name: Install dependencies
+        run: npm ci
 
-    - name: Run tests
-      run: npm test
+      - name: Run tests
+        run: npm test
+        env:
+          BASE: ${{ github.event.pull_request.base.ref }}

.github/workflows/validate-markdown.yaml

@@ -7,25 +7,26 @@ name: validate-markdown
 # This workflow validates markdown files in the versions directory matching *.md
 #
 
-# run this on push to any branch and creation of pull-requests
-on: [push, pull_request]
+# run this on pull-requests (creation and updates) and on manual trigger
+on:
+  pull_request: {}
+  workflow_dispatch: {}
 
 jobs:
   mdv:
-
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v5 # checkout repo content
-      with:
-        fetch-depth: 0
-    # - name: use the javascript environment from main
-    #   run: |
-    #     git checkout remotes/origin/main -- package.json package-lock.json .markdownlint.yaml
-    - uses: actions/setup-node@v6 # setup Node.js
-      with:
-        node-version: '20.x'
-    - name: Validate markdown
-      run: npx --yes mdv versions/*.md
-    - name: Lint markdown
-      run: npx --yes markdownlint-cli --config .markdownlint.yaml versions/*.md
+      - uses: actions/checkout@v5 # checkout repo content
+        with:
+          fetch-depth: 0
+      # - name: use the javascript environment from main
+      #   run: |
+      #     git checkout remotes/origin/main -- package.json package-lock.json .markdownlint.yaml
+      - uses: actions/setup-node@v6 # setup Node.js
+        with:
+          node-version: "22.x"
+      - name: Validate markdown
+        run: npx --yes mdv versions/*.md
+      - name: Lint markdown
+        run: npx --yes markdownlint-cli --config .markdownlint.yaml versions/*.md

package-lock.json

@@ -21,7 +21,7 @@
     "yargs": "^18.0.0"
   },
   "devDependencies": {
-    "@hyperjump/json-schema": "^1.9.9",
+    "@hyperjump/json-schema-coverage": "^1.1.1",
     "c8": "^10.1.3",
     "markdownlint-cli": "^0.45.0",
     "mdv": "^1.3.4",
@@ -41,6 +41,6 @@
   "scripts": {
     "build": "bash ./scripts/md2html/build.sh",
     "format-markdown": "bash ./scripts/format-markdown.sh ./versions/*.md",
-    "test": "c8 --100 vitest --watch=false && bash scripts/schema-test-coverage.sh"
+    "test": "c8 --100 vitest run --coverage"
   }
 }