Skip to content

Commit

Permalink
2023-06 Yearly updates (#32)
Browse files Browse the repository at this point in the history
* update 1 for 2023-06

* closes #33. closes #34

* update to SMPTE DCI contact

* push to pub

* bump tooling

* update workflow
  • Loading branch information
SteveLLamb authored Sep 1, 2023
1 parent 5f27118 commit 66d1966
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 19 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ env:
jobs:
build:
runs-on: ubuntu-latest
if: (github.event_name == 'push' && github.ref == 'refs/heads/main') || github.event_name == 'pull_request'
if: github.repository_owner == 'SMPTE' && ((github.event_name == 'push' && github.ref == 'refs/heads/main') || github.event_name == 'pull_request')
# These permissions are needed to interact with GitHub's OIDC Token endpoint.
permissions:
id-token: write
Expand All @@ -24,14 +24,13 @@ jobs:
uses: actions/checkout@v3
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}
submodules: true

- name: Set repository name
run: echo "REPOSITORY_NAME=${GITHUB_REPOSITORY#*/}" >> $GITHUB_ENV

- name: Check out all branches with the exception of the current branch
run: CUR_BRANCH=$(git rev-parse --abbrev-ref HEAD); for i in `git branch -a | grep remote | grep -v HEAD | grep -v ${CUR_BRANCH}`; do git branch --track ${i#remotes/origin/} $i; done
run: CUR_BRANCH=$(git rev-parse --abbrev-ref HEAD); for i in `git branch -a | grep remote | grep -v "remotes/pull" | grep -v HEAD | grep -v ${CUR_BRANCH}`; do git branch --track ${i#remotes/origin/} $i; done

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1-node16
Expand All @@ -44,7 +43,7 @@ jobs:
if: github.repository != 'SMPTE/html-pub'
with:
AWS_S3_REGION: ${{env.AWS_REGION}}
AWS_S3_BUCKET: ${{env.AWS_S3_BUCKET}}
AWS_S3_BUCKET: ${{env.AWS_S3_BUCKET}}
AWS_S3_KEY_PREFIX: "${{env.REPOSITORY_NAME}}/"
CANONICAL_LINK_PREFIX: ${{env.CANONICAL_LINK_PREFIX}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
Expand All @@ -54,7 +53,7 @@ jobs:
if: github.repository == 'SMPTE/html-pub'
with:
AWS_S3_REGION: ${{env.AWS_REGION}}
AWS_S3_BUCKET: ${{env.AWS_S3_BUCKET}}
AWS_S3_BUCKET: ${{env.AWS_S3_BUCKET}}
AWS_S3_KEY_PREFIX: "${{env.REPOSITORY_NAME}}/"
CANONICAL_LINK_PREFIX: ${{env.CANONICAL_LINK_PREFIX}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
2 changes: 1 addition & 1 deletion .smpte-build.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"latestEditionTag": "pub-2023-04-09"
"latestEditionTag": "pub-2023-08-29"
}
30 changes: 18 additions & 12 deletions doc/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<meta charset="utf-8" />
<meta http-equiv="x-ua-compatible" content="ie=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<script src="../tooling/smpte.js"></script>
<script type="module" src="../tooling/smpte.js"></script>
<meta itemprop="pubType" content="AG" />
<meta itemprop="pubNumber" content="10" />
<meta itemprop="pubState" content="draft" />
<meta itemprop="pubDateTime" content="2023-04-09" />
<meta itemprop="pubState" content="pub" />
<meta itemprop="pubDateTime" content="2023-08-29" />
<title>Liaisons Delegates Rapporteurs</title>
</head>

Expand Down Expand Up @@ -130,7 +130,7 @@ <h2>Organizations, Delegates and Rapporteurs</h2>
</tr>
<tr>
<td>AMWA </td>
<td>Brad Gilmer </td>
<td>Tina Lipscomb</td>
<td> </td>
<td></td>
</tr>
Expand All @@ -152,6 +152,12 @@ <h2>Organizations, Delegates and Rapporteurs</h2>
<td> </td>
<td></td>
</tr>
<tr>
<td>CEDIA </td>
<td>Walt Zerbe</td>
<td>Shawn Nagell </td>
<td></td>
</tr>
<tr>
<td>CTA </td>
<td>Brian Markwalter </td>
Expand All @@ -160,8 +166,8 @@ <h2>Organizations, Delegates and Rapporteurs</h2>
</tr>
<tr>
<td>DCI </td>
<td>Sterling Silva </td>
<td> </td>
<td>Mike Radford </td>
<td>Mike Radford </td>
<td></td>
</tr>
<tr>
Expand Down Expand Up @@ -214,7 +220,7 @@ <h2>Organizations, Delegates and Rapporteurs</h2>
</tr>
<tr>
<td>ISO TC42 </td>
<td>Michael D. Smith </td>
<td>Edward Terhune</td>
<td>Michael D. Smith </td>
<td></td>
</tr>
Expand All @@ -226,35 +232,35 @@ <h2>Organizations, Delegates and Rapporteurs</h2>
</tr>
<tr>
<td>JT-NM </td>
<td>Bob Ruhl </td>
<td>Tina Lipscomb</td>
<td>Bruce Devlin </td>
<td>HOD </td>
</tr>
<tr>
<td>NABA </td>
<td>Michael McEwen </td>
<td>Rebecca Hanson </td>
<td> </td>
<td></td>
</tr>
<tr>
<td>SCTE DVS </td>
<td>Paul Hearty<br />
Dean Stoneback <br />
Rebecca Yaletchka </td>
Mary Heenan </td>
<td> </td>
<td></td>
</tr>
<tr>
<td>UHD Forum </td>
<td>Pat Griffis </td>
<td>Pat Griffis </td>
<td>Kent Terry </td>
<td>Rapporteur </td>
</tr>
<tr>
<td>UNIC </td>
<td>Laura Houlgatte</td>
<td>Steve LLamb </td>
<td></td>
<td>Rapporteur</td>
</tr>
<tr>
<td>W3C </td>
Expand Down
2 changes: 1 addition & 1 deletion tooling
Submodule tooling updated 43 files
+2 −3 .github/workflows/main.yml
+1 −1 .smpte-build.json
+7 −0 css/smpte-errors.css
+288 −59 css/smpte.css
+1,308 −134 doc/main.html
+41 −0 doc/snippets/list-sample-complex.txt
+8 −0 doc/snippets/pre-commit
+1 −1 doc/snippets/skeleton.html
+27 −0 doc/snippets/tab-sample-tabledata-centercell.txt
+27 −0 doc/snippets/tab-sample-tabledata-colcenter.txt
+30 −0 doc/snippets/tab-sample-tabledata-colspan.txt
+52 −0 doc/snippets/tab-sample-tabledata-complex.txt
+27 −0 doc/snippets/tab-sample-tabledata-defaultalign.txt
+32 −0 doc/snippets/tab-sample-tabledata-multiheader.txt
+26 −0 doc/snippets/tab-sample-tabledata-rowspan.txt
+152 −1 js/common.mjs
+642 −198 js/validate.mjs
+2,159 −1,700 package-lock.json
+5 −3 package.json
+175 −35 scripts/build.mjs
+2 −2 scripts/validate.mjs
+390 −183 smpte.js
+ static/smpte-icon.png
+39 −30 test/resources/html/validation/annex-reference-valid.html
+0 −1 test/resources/html/validation/bibliography-valid.html
+0 −1 test/resources/html/validation/body-order-invalid.html
+31 −0 test/resources/html/validation/dl-valid.html
+0 −1 test/resources/html/validation/effectiveDateTime-invalid.html
+0 −1 test/resources/html/validation/elements-invalid.html
+0 −1 test/resources/html/validation/elements-valid.html
+23 −0 test/resources/html/validation/example-valid.html
+0 −1 test/resources/html/validation/general-valid.html
+23 −0 test/resources/html/validation/note-valid.html
+30 −0 test/resources/html/validation/ol-valid.html
+0 −1 test/resources/html/validation/om-valid.html
+26 −0 test/resources/html/validation/one-subclause-invalid.html
+0 −1 test/resources/html/validation/pubDateTime-invalid.html
+0 −1 test/resources/html/validation/pubState-invalid.html
+18 −0 test/resources/html/validation/pubVersion-invalid.html
+22 −0 test/resources/html/validation/st-valid.html
+4 −3 test/resources/html/validation/terms-valid.html
+16 −8 test/src/testValidation.mjs
+12 −0 workflows/action.yml

0 comments on commit 66d1966

Please sign in to comment.