Merge branch 'main' into aria-hidden-focused-expectations

w3c · Jan 30, 2025 · ac39838 · ac39838
2 parents f07370a + a2d34fe
commit ac39838
Show file tree

Hide file tree

Showing 40 changed files with 2,954 additions and 187 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -0,0 +1,43 @@
+spec:aria:
+  - changed-files:
+    - any-glob-to-any-file: 'index.html'
+
+spec:accname:
+  - changed-files:
+    - any-glob-to-any-file: 'accname/**'
+
+spec:core-aam:
+  - changed-files:
+    - any-glob-to-any-file: 'core-aam/**'
+
+spec:dpub-aam:
+  - changed-files:
+    - any-glob-to-any-file: 'dpub-aam/**'
+
+spec:dpub-aria:
+  - changed-files:
+    - any-glob-to-any-file: 'dpub-aria/**'
+
+spec:graphics-aam:
+  - changed-files:
+    - any-glob-to-any-file: 'graphics-aam/**'
+
+spec:graphics-aria:
+  - changed-files:
+    - any-glob-to-any-file: 'graphics-aria/**'
+
+spec:html-aam:
+  - changed-files:
+    - any-glob-to-any-file: 'html-aam/**'
+
+spec:svg-aam:
+  - changed-files:
+    - any-glob-to-any-file: 'svg-aam/**'
+
+spec:mathml-aam:
+  - changed-files:
+    - any-glob-to-any-file: 'mathml-aam/**'
+
+spec:pdf-aam:
+  - changed-files:
+    - any-glob-to-any-file: 'pdf-aam/**'
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -2,7 +2,9 @@ Closes #????
 
 Describe Change Here!
 
-<!--- IF EDITORIAL or CHORE, delete the rest of this template -->
+And a few other todo items (delete this section after performing them):
+* [ ] For every spec that this PR edits, please add the appropriate `spec:<spec_name>` label. If you don't have privileges to do this, editors will do it for you.
+* [ ] If the change is [editorial](https://github.com/w3c/aria/blob/main/documentation/process.md#editorial-changes), please add "Editorial:" at the start of your PR name, and delete the "Test, Documentation and Implementation tracking" section below.
 
 # Test, Documentation and Implementation tracking
 Once this PR has been reviewed and has consensus from the working group, tests should be written and issues should be opened on browsers. Add N/A and check when not applicable.

diff --git a/.github/workflows/accname.yml b/.github/workflows/accname.yml
@@ -16,7 +16,7 @@ jobs:
         run: |
           curl -L -X POST \
           -H "Accept: application/vnd.github+json" \
-          -H "Authorization: Bearer ${{secrets.ARIA_EDITOR_DRAFTS}}" \
+          -H "Authorization: Bearer ${{secrets.W3CGRUNTBOT_TOKEN}}" \
           -H "X-GitHub-Api-Version: 2022-11-28" \
           https://api.github.com/repos/w3c/accname/actions/workflows/build-from-monorepo.yaml/dispatches \
           -d '{"ref":"gh-pages"}'
@@ -52,7 +52,7 @@ jobs:
           repository: w3c/accname
           ref: gh-pages
           path: accname
-          token: ${{ secrets.ARIA_EDITOR_DRAFTS }}
+          token: ${{ secrets.W3CGRUNTBOT_TOKEN }}
       - uses: actions/download-artifact@v4
         with:
           name: accname

diff --git a/.github/workflows/core-aam.yml b/.github/workflows/core-aam.yml
@@ -16,7 +16,7 @@ jobs:
         run: |
           curl -L -X POST \
           -H "Accept: application/vnd.github+json" \
-          -H "Authorization: Bearer ${{secrets.ARIA_EDITOR_DRAFTS}}" \
+          -H "Authorization: Bearer ${{secrets.W3CGRUNTBOT_TOKEN}}" \
           -H "X-GitHub-Api-Version: 2022-11-28" \
           https://api.github.com/repos/w3c/core-aam/actions/workflows/build-from-monorepo.yaml/dispatches \
           -d '{"ref":"gh-pages"}'
@@ -53,7 +53,7 @@ jobs:
           repository: w3c/core-aam
           ref: gh-pages
           path: core-aam
-          token: ${{ secrets.ARIA_EDITOR_DRAFTS }}
+          token: ${{ secrets.W3CGRUNTBOT_TOKEN }}
       - uses: actions/download-artifact@v4
         with:
           name: core-aam

diff --git a/.github/workflows/dpub-aam.yml b/.github/workflows/dpub-aam.yml
@@ -16,7 +16,7 @@ jobs:
         run: |
           curl -L -X POST \
           -H "Accept: application/vnd.github+json" \
-          -H "Authorization: Bearer ${{secrets.ARIA_EDITOR_DRAFTS}}" \
+          -H "Authorization: Bearer ${{secrets.W3CGRUNTBOT_TOKEN}}" \
           -H "X-GitHub-Api-Version: 2022-11-28" \
           https://api.github.com/repos/w3c/dpub-aam/actions/workflows/build-from-monorepo.yaml/dispatches \
           -d '{"ref":"gh-pages"}'
@@ -52,7 +52,7 @@ jobs:
           repository: w3c/dpub-aam
           ref: gh-pages
           path: dpub-aam
-          token: ${{ secrets.ARIA_EDITOR_DRAFTS }}
+          token: ${{ secrets.W3CGRUNTBOT_TOKEN }}
       - uses: actions/download-artifact@v4
         with:
           name: dpub-aam

diff --git a/.github/workflows/dpub-aria.yml b/.github/workflows/dpub-aria.yml
@@ -16,7 +16,7 @@ jobs:
         run: |
           curl -L -X POST \
           -H "Accept: application/vnd.github+json" \
-          -H "Authorization: Bearer ${{secrets.ARIA_EDITOR_DRAFTS}}" \
+          -H "Authorization: Bearer ${{secrets.W3CGRUNTBOT_TOKEN}}" \
           -H "X-GitHub-Api-Version: 2022-11-28" \
           https://api.github.com/repos/w3c/dpub-aria/actions/workflows/build-from-monorepo.yaml/dispatches \
           -d '{"ref":"gh-pages"}'
@@ -52,7 +52,7 @@ jobs:
           repository: w3c/dpub-aria
           ref: gh-pages
           path: dpub-aria
-          token: ${{ secrets.ARIA_EDITOR_DRAFTS }}
+          token: ${{ secrets.W3CGRUNTBOT_TOKEN }}
       - uses: actions/download-artifact@v4
         with:
           name: dpub-aria

diff --git a/.github/workflows/graphics-aam.yml b/.github/workflows/graphics-aam.yml
@@ -16,7 +16,7 @@ jobs:
         run: |
           curl -L -X POST \
           -H "Accept: application/vnd.github+json" \
-          -H "Authorization: Bearer ${{secrets.ARIA_EDITOR_DRAFTS}}" \
+          -H "Authorization: Bearer ${{secrets.W3CGRUNTBOT_TOKEN}}" \
           -H "X-GitHub-Api-Version: 2022-11-28" \
           https://api.github.com/repos/w3c/graphics-aam/actions/workflows/build-from-monorepo.yaml/dispatches \
           -d '{"ref":"gh-pages"}'
@@ -43,7 +43,7 @@ jobs:
           repository: w3c/graphics-aam
           ref: gh-pages
           path: graphics-aam
-          token: ${{ secrets.ARIA_EDITOR_DRAFTS }}
+          token: ${{ secrets.W3CGRUNTBOT_TOKEN }}
       - uses: actions/download-artifact@v4
         with:
           name: graphics-aam

diff --git a/.github/workflows/html-amm.yml b/.github/workflows/html-amm.yml
@@ -16,7 +16,7 @@ jobs:
         run: |
           curl -L -X POST \
           -H "Accept: application/vnd.github+json" \
-          -H "Authorization: Bearer ${{secrets.ARIA_EDITOR_DRAFTS}}" \
+          -H "Authorization: Bearer ${{secrets.W3CGRUNTBOT_TOKEN}}" \
           -H "X-GitHub-Api-Version: 2022-11-28" \
           https://api.github.com/repos/w3c/html-aam/actions/workflows/build-from-monorepo.yaml/dispatches \
           -d '{"ref":"gh-pages"}'
@@ -53,7 +53,7 @@ jobs:
           repository: w3c/html-aam
           ref: gh-pages
           path: html-aam
-          token: ${{ secrets.ARIA_EDITOR_DRAFTS }}
+          token: ${{ secrets.W3CGRUNTBOT_TOKEN }}
       - uses: actions/download-artifact@v4
         with:
           name: html-aam

diff --git a/.github/workflows/labeler.yaml b/.github/workflows/labeler.yaml
@@ -0,0 +1,15 @@
+name: "Pull Request Labeler"
+on:
+- pull_request_target
+
+jobs:
+  labeler:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4 # Uploads repository content to the runner
+    - uses: actions/labeler@v5
+      with:
+        sync-labels: true
diff --git a/.github/workflows/mathml-aam.yml b/.github/workflows/mathml-aam.yml
@@ -16,7 +16,7 @@ jobs:
         run: |
           curl -L -X POST \
           -H "Accept: application/vnd.github+json" \
-          -H "Authorization: Bearer ${{secrets.ARIA_EDITOR_DRAFTS}}" \
+          -H "Authorization: Bearer ${{secrets.W3CGRUNTBOT_TOKEN}}" \
           -H "X-GitHub-Api-Version: 2022-11-28" \
           https://api.github.com/repos/w3c/mathml-aam/actions/workflows/build-from-monorepo.yaml/dispatches \
           -d '{"ref":"gh-pages"}'
@@ -43,7 +43,7 @@ jobs:
           repository: w3c/mathml-aam
           ref: gh-pages
           path: mathml-aam
-          token: ${{ secrets.ARIA_EDITOR_DRAFTS }}
+          token: ${{ secrets.W3CGRUNTBOT_TOKEN }}
       - uses: actions/download-artifact@v4
         with:
           name: mathml-aam

diff --git a/.github/workflows/pdf-aam.yml b/.github/workflows/pdf-aam.yml
@@ -0,0 +1,69 @@
+name: pdf-aam ED
+on:
+  push:
+    branches:
+      - 'main'
+    paths:
+      - 'common/**'
+      - 'pdf-aam/**'
+  workflow_dispatch:
+
+jobs:
+  dispatch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Dispatch to pdf-aam repo
+        run: |
+          curl -L -X POST \
+          -H "Accept: application/vnd.github+json" \
+          -H "Authorization: Bearer ${{secrets.W3CGRUNTBOT_TOKEN}}" \
+          -H "X-GitHub-Api-Version: 2022-11-28" \
+          https://api.github.com/repos/w3c/pdf-aam/actions/workflows/build-from-monorepo.yaml/dispatches \
+          -d '{"ref":"gh-pages"}'
+  update-pdf-aam:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout monorepo
+        uses: actions/checkout@v4
+        with:
+          ref: main
+          path: aria
+          sparse-checkout: |
+            pdf-aam
+            common
+      - name: Copy common
+        run: |
+          mkdir aria/pdf-aam/common
+          cp -r aria/common/** aria/pdf-aam/common/    
+          sed -i 's|\.\./common|common|g' aria/pdf-aam/index.html
+      - uses: w3c/spec-prod@v2
+        with:
+          TOOLCHAIN: respec
+          SOURCE: aria/pdf-aam/index.html
+          DESTINATION: aria/pdf-aam/index.html
+          # W3C_ECHIDNA_TOKEN: ${{ secrets.ECHIDNA_TOKEN_pdf_aam }}
+          # W3C_WG_DECISION_URL: https://lists.w3.org/Archives/Public/public-aria-admin/2018Sep/0011.html
+          # W3C_BUILD_OVERRIDE: |
+          #   specStatus: WD
+          ARTIFACT_NAME: pdf-aam
+      - name: Checkout pdf-aam repo
+        uses: actions/checkout@v4
+        with:
+          repository: w3c/pdf-aam
+          ref: gh-pages
+          path: pdf-aam
+          token: ${{ secrets.W3CGRUNTBOT_TOKEN }}
+      - uses: actions/download-artifact@v4
+        with:
+          name: pdf-aam
+      - name: Copy files
+        run: |
+          cp -r aria.common/aria/pdf-aam/** pdf-aam/
+      - name: Push new files to child repo
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git add .
+          git commit -m "ED update"
+          git push origin gh-pages
+        working-directory: pdf-aam
diff --git a/.github/workflows/prettier.yaml b/.github/workflows/prettier.yaml
@@ -15,13 +15,23 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
         with:
-          # Make sure the actual branch is checked out when running on pull requests
-          ref: ${{ github.head_ref }}
-          # This is important to fetch the changes to the previous commit
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
           fetch-depth: 0
 
+      - name: Check if PR is from a fork
+        id: check_fork
+        run: echo "::set-output name=is_fork::${{ github.event.pull_request.head.repo.fork }}"
+
       - name: Prettify code
+        id: prettify
         uses: creyD/[email protected]
         with:
+          dry: true
           prettier_options: --write **/index.html --print-width 200
           commit_message: "chore: prettier"
+        continue-on-error: true
+
+      - name: Handle commit failure
+        if: ${{ steps.prettify.outcome == 'failure' && steps.check_fork.outputs.is_fork == 'true' }}
+        run: echo "Please run prettier locally"
diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1,3 @@
+{
+  "printWidth": 200
+}
diff --git a/accname/index.html b/accname/index.html
@@ -8,6 +8,7 @@
     <script src="../common/script/resolveReferences.js" class="remove"></script>
     <script src="../common/script/utility.js" class="remove"></script>
     <script src="../common/biblio.js" class="remove" defer="defer"></script>
+    <script src="../common/script/participants.js" class="remove"></script>
     <script class="remove">
       var respecConfig = {
         github: "w3c/accname",
@@ -131,7 +132,7 @@
           REC: "https://www.w3.org/WAI/ARIA/apg/",
         },
 
-        preProcess: [linkCrossReferences],
+        preProcess: [linkCrossReferences, getParticipants],
         postProcess: [addPlatformMaintainers],
         //Pointing to the 1.2 versions but should remove the version in the publishing branch
         xref: ["dom", "core-aam-1.2", "wai-aria-1.2", "infra"],
@@ -784,7 +785,15 @@ <h2>Substantive changes since the <a href="https://www.w3.org/TR/accname-1.1/">A
       <section class="appendix informative section" id="acknowledgements">
         <h3>Acknowledgments</h3>
         <p>The following people contributed to the development of this document.</p>
-        <div data-include="../common/acknowledgements/aria-wg-active.html" data-include-replace="true"></div>
+        <ul id="gh-contributors">
+          <!-- GitHub contributors go here -->
+        </ul>
+        <section class="section" id="ack_group">
+          <h4>ARIA WG participants at the time of publication</h4>
+          <ul>
+            <!-- List of participants is injected here -->
+          </ul>
+        </section>
         <div data-include="../common/acknowledgements/funders.html" data-include-replace="true"></div>
       </section>
     </section>