v1.1-dev: sync from main

.github/CODEOWNERS

@@ -1 +1 @@
-* @oai/tsc
+* @oai/tsc @OAI/overlay-maintainers

.github/dependabot.yml

@@ -0,0 +1,16 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+  - package-ecosystem: npm
+    directory: "/"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    groups:
+      vitest:
+        patterns:
+          - "*vitest*"

.github/workflows/agenda.yaml

@@ -3,28 +3,44 @@ 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:
     permissions:
       discussions: write
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
+      - 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

@@ -4,68 +4,70 @@ name: respec
 # issue: https://github.com/OAI/OpenAPI-Specification/issues/1564
 
 #
-# This workflow updates the respec 'pretty' rendered versions of the spec 
+# This workflow updates the respec 'pretty' rendered versions of the spec
 # on the gh-pages branch when the corresponding markdown files change.
 #
 
-# run this on push to main
+# run this on push of new spec versions to main
 on:
   push:
+    paths:
+      - "versions/**"
     branches:
       - main
   workflow_dispatch: {}
 
 jobs:
   respec:
     if: github.repository == 'OAI/Overlay-Specification'
-    
+
     runs-on: ubuntu-22.04
 
     steps:
-    - name: Generate access token
-      id: generate-token
-      uses: actions/create-github-app-token@v1
-      with:
-        app-id: ${{ secrets.OAI_SPEC_PUBLISHER_APPID }}
-        private-key: ${{ secrets.OAI_SPEC_PUBLISHER_PRIVATE_KEY }}
-        owner: OAI
-        repositories: OpenAPI-Specification
-
-    - uses: actions/checkout@v4 # checkout main branch
-      with:
-        fetch-depth: 0
+      - name: Generate access token
+        id: generate-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.OAI_SPEC_PUBLISHER_APPID }}
+          private-key: ${{ secrets.OAI_SPEC_PUBLISHER_PRIVATE_KEY }}
+          owner: OAI
+          repositories: OpenAPI-Specification
+
+      - uses: actions/checkout@v5 # checkout main branch
+        with:
+          fetch-depth: 0
+
+      - uses: actions/setup-node@v6 # setup Node.js
+        with:
+          node-version: "22.x"
 
-    - uses: actions/setup-node@v4 # setup Node.js
-      with:
-        node-version: '20.x'
-
-    - name: Install dependencies
-      run: npm ci
+      - name: Install dependencies
+        run: npm ci
 
-    - uses: actions/checkout@v4 # checkout gh-pages branch
-      with:
-        token: ${{ steps.generate-token.outputs.token }}
-        repository: OAI/OpenAPI-Specification  # TODO: change to OAI/...
-        ref: gh-pages
-        path: deploy
+      - uses: actions/checkout@v5 # checkout gh-pages branch
+        with:
+          token: ${{ steps.generate-token.outputs.token }}
+          repository: OAI/OpenAPI-Specification # TODO: change to OAI/...
+          ref: gh-pages
+          path: deploy
 
-    - name: run main script
-      run: scripts/md2html/build.sh
+      - name: run main script
+        run: scripts/md2html/build.sh
 
-    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v7
-      with:
-        token: ${{ steps.generate-token.outputs.token }}
-        branch: update-overlay-respec-version
-        base: gh-pages
-        delete-branch: true
-        path: deploy
-        labels: Housekeeping
-        reviewers: darrelmiller,webron,earth2marsh,lornajane,mikekistler,miqui,handrews,ralfhandl
-        title: Overlay - Update ReSpec-rendered specification versions
-        commit-message: Update ReSpec-rendered specification versions
-        signoff: true
-        body: |
-          This pull request is automatically triggered by GitHub action `respec` in the OAI/Overlay-Specification repo.
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v7
+        with:
+          token: ${{ steps.generate-token.outputs.token }}
+          branch: update-overlay-respec-version
+          base: gh-pages
+          delete-branch: true
+          path: deploy
+          labels: Housekeeping
+          reviewers: darrelmiller,webron,earth2marsh,lornajane,mikekistler,miqui,handrews,ralfhandl
+          title: Overlay - Update ReSpec-rendered specification versions
+          commit-message: Update ReSpec-rendered specification versions
+          signoff: true
+          body: |
+            This pull request is automatically triggered by GitHub action `respec` in the OAI/Overlay-Specification repo.
 
-          The `versions/*.md` files have changed, so the HTML files are automatically being regenerated.
+            The `versions/*.md` files have changed, so the HTML files are automatically being regenerated.

.github/workflows/schema-publish.yaml

@@ -15,30 +15,31 @@ on:
 
 jobs:
   publish:
+    if: github.repository == 'OAI/Overlay-Specification'
     runs-on: ubuntu-latest
 
     steps:
       - name: Generate access token
         id: generate-token
-        uses: actions/create-github-app-token@v1
+        uses: actions/create-github-app-token@v2
         with:
           app-id: ${{ secrets.OAI_SPEC_PUBLISHER_APPID }}
           private-key: ${{ secrets.OAI_SPEC_PUBLISHER_PRIVATE_KEY }}
           owner: OAI
           repositories: OpenAPI-Specification
 
-      - uses: actions/checkout@v4 # checkout main branch
+      - uses: actions/checkout@v5 # checkout main branch
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-node@v4 # setup Node.js
+      - uses: actions/setup-node@v6 # setup Node.js
         with:
-          node-version: 20.x
+          node-version: "22.x"
 
       - name: Install dependencies
         run: npm ci
 
-      - uses: actions/checkout@v4 # checkout gh-pages branch
+      - uses: actions/checkout@v5 # checkout gh-pages branch
         with:
           token: ${{ steps.generate-token.outputs.token }}
           repository: OAI/OpenAPI-Specification

.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@v4 # checkout repo content
-      with:
-        fetch-depth: 0
+      - uses: actions/checkout@v5 # checkout repo content
+        with:
+          fetch-depth: 0
 
-    - uses: actions/setup-node@v4 # 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@v4 # 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@v4 # 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

README.md

@@ -26,6 +26,7 @@ If you are looking for tools to use with Overlays, try these:
 - [oas-overlay-java](https://github.com/IBM/oas-overlay-java)
 - [Specmatic](https://specmatic.io/) - [Docs](https://docs.specmatic.io/documentation/contract_tests.html#overlays)
 - [BinkyLabs.OpenApi.Overlays - dotnet](https://github.com/BinkyLabs/openapi-overlays-dotnet)
+- [Legba - Clojure OpenAPI toolkit](https://github.com/mpenet/legba?tab=readme-ov-file#openapi-overlay-support)
 
 (Is something missing from the list? Send us a pull request to add it!)