Schema Publish workflow - #4162

Merged
ralfhandl merged 5 commits into
OAI:mainfrom
ralfhandl:main-schema-publish
Nov 7, 2024
Merged

Schema Publish workflow#4162
ralfhandl merged 5 commits into
OAI:mainfrom
ralfhandl:main-schema-publish

Conversation

@ralfhandl

@ralfhandlralfhandl commented Oct 25, 2024

Copy link
Copy Markdown
Contributor

Follow-up to

Replace WORK-IN-PROGRESS placeholders with date of last change of YAML source:

  • if meta changes, republish all four files
  • if dialect changes, republish it, schema, and schema_base
  • if schema changes, republish it and schema_base
  • if schema_base changes, republish it
  • new date stamp for each schema is the maximum date of last commit in the dependency chain:
flowchart LR
schema_base
schema
dialect
meta
schema --> |default| dialect
schema_base --> |$ref| schema
schema_base --> |$ref| dialect
dialect --> |$ref| meta
Loading
  • GitHub workflow
  • bash script called from workflow
  • Dependencies between schema files
  • Use systematic source schema names

Example PR created by this workflow

@ralfhandl
ralfhandl requested review from a team as code ownersOctober 25, 2024 13:56
@ralfhandlralfhandl added Housekeeping script Pull requests that update Bash or JavaScript code labels Oct 26, 2024

@handrewshandrews left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a little confused because this seems to get triggered for any commit to the main branch rather than filtering on the schemas, and it does not seem to check that the $GITHUB_SHA commit includes at least one schema either.

But I'm not very familiar with either github actions or bash scripting, so what am I missing here?

if [ "$lastCommitDate" \> "$maxDate" ]; then
maxDate=$lastCommitDate
fi
datesHash["$schema"]=$maxDate

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we want each datesHash["$schema"] to have $schema's date, which would be $lastCommitDate and not $maxDate? It's not clear to me what $maxDate is intended to do here.

@ralfhandlralfhandlOct 28, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The schemas are visited in the order of their dependency:

  • If meta changes, dialect needs to be updated. If dialect itself has changed, its new date is the maximum of the two change dates.
  • If dialect changes, schema needs to be updated. If schema itself has changed, its new date is the maximum of the two change dates.
  • If schema changes, schema_base needs to be updated. If schema_base itself has changed, its new date is the maximum of the two change dates.

This is what the loop & $maxDate do because we currently have a linear dependency chain. If we get more files and non-linear dependencies, this has to be revisited.

@ralfhandl

Copy link
Copy Markdown
ContributorAuthor

this seems to get triggered for any commit to the main branch rather than filtering on the schemas

This action needs to run if

  • one of the YAML files in folder schemas changes,
  • scripts/schema-publish.sh changes,
  • scripts/yaml2json/yaml2json.js changes, or
  • .github/workflows/schema-publish.yaml changes

We could do that with a paths filter in addition to the branches filter, but then the TSC collective mind needs to remember changing this filter if these dependencies change.

Given that the workflow only creates a pull request for publishing the schemas if it actually produces changes compared to gh-pages, I think it is safer and more future-proof to run the workflow on any change to main without a paths filter.

@ralfhandl

Copy link
Copy Markdown
ContributorAuthor

it does not seem to check that the $GITHUB_SHA commit includes at least one schema

According to GitHub Docs on the push and workflow_dispatch events GITHUB_SHA is

Tip commit pushed to the ref

or

Last commit on the GITHUB_REF branch or tag

This seems to indicate that if I

  1. change schema.yaml and commit
  2. change README.md and commit
  3. push

Then the GITHUB_SHA will be the commit changing README.md.

It seems safer to refresh the JSON files based on the date of the last change to the corresponding YAML file and its dependent YAML files.

@handrews

Copy link
Copy Markdown
Member

@ralfhandl

It seems safer to refresh the JSON files based on the date of the last change to the corresponding YAML file and its dependent YAML files.

Yes if we're not filtering the trigger then we need to filter the commits.

@ralfhandl

Copy link
Copy Markdown
ContributorAuthor

Yes if we're not filtering the trigger then we need to filter the commits.

We use the date of the last commit for each file to produce its relevant date, in combination with the new dates of all files it references.

The workflow then creates a pull request for publishing all new/changed/renamed/deleted files.

Git figures out which files actually need to be in the pull request, and if there are none, no pull request is created.

This is the same mechanism we use for publishing the spec HTML files.

@handrews

Copy link
Copy Markdown
Member

@ralfhandl sorry for not finishing up with this yesterday- I was trying to figure out the code and suggest some comments to put in it because I get what you're saying but for some reason I am finding the code really hard to follow. I think the name lastDate is throwing me because while I get why you called it that ,it does not behave like I expect a variable with that name to behave. I expected it to accumulate the very last date across all and then use it, but perhaps you meant "last" in the sense of "previous"?

@ralfhandl

Copy link
Copy Markdown
ContributorAuthor

Changed the name to something hopefully less confusing and added a few comments.

@handrewshandrews left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I find this easier to follow (and I now realize that my previous comment was misleading as I was confused by maxDate more than lastDate), but I'm finding it hard to come up with an improvement so I suppose I'll just stop standing in the way. I don't know why I find this so baffling.

@ralfhandl
ralfhandl merged commit 7e96988 into OAI:mainNov 7, 2024
@ralfhandl
ralfhandl deleted the main-schema-publish branch November 7, 2024 17:04
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

HousekeepingscriptPull requests that update Bash or JavaScript code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@ralfhandl@handrews@miqui
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Schema Publish workflow - #4162

Merged
ralfhandl merged 5 commits into
OAI:mainfrom
ralfhandl:main-schema-publish
Nov 7, 2024
Merged

Schema Publish workflow#4162
ralfhandl merged 5 commits into
OAI:mainfrom
ralfhandl:main-schema-publish

Conversation

@ralfhandl

@ralfhandlralfhandl commented Oct 25, 2024

Copy link
Copy Markdown
Contributor

Follow-up to

Replace WORK-IN-PROGRESS placeholders with date of last change of YAML source:

  • if meta changes, republish all four files
  • if dialect changes, republish it, schema, and schema_base
  • if schema changes, republish it and schema_base
  • if schema_base changes, republish it
  • new date stamp for each schema is the maximum date of last commit in the dependency chain:
flowchart LR
schema_base
schema
dialect
meta
schema --> |default| dialect
schema_base --> |$ref| schema
schema_base --> |$ref| dialect
dialect --> |$ref| meta
Loading
  • GitHub workflow
  • bash script called from workflow
  • Dependencies between schema files
  • Use systematic source schema names

Example PR created by this workflow

@ralfhandl
ralfhandl requested review from a team as code ownersOctober 25, 2024 13:56
@ralfhandlralfhandl added Housekeeping script Pull requests that update Bash or JavaScript code labels Oct 26, 2024

@handrewshandrews left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a little confused because this seems to get triggered for any commit to the main branch rather than filtering on the schemas, and it does not seem to check that the $GITHUB_SHA commit includes at least one schema either.

But I'm not very familiar with either github actions or bash scripting, so what am I missing here?

if [ "$lastCommitDate" \> "$maxDate" ]; then
maxDate=$lastCommitDate
fi
datesHash["$schema"]=$maxDate

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we want each datesHash["$schema"] to have $schema's date, which would be $lastCommitDate and not $maxDate? It's not clear to me what $maxDate is intended to do here.

@ralfhandlralfhandlOct 28, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The schemas are visited in the order of their dependency:

  • If meta changes, dialect needs to be updated. If dialect itself has changed, its new date is the maximum of the two change dates.
  • If dialect changes, schema needs to be updated. If schema itself has changed, its new date is the maximum of the two change dates.
  • If schema changes, schema_base needs to be updated. If schema_base itself has changed, its new date is the maximum of the two change dates.

This is what the loop & $maxDate do because we currently have a linear dependency chain. If we get more files and non-linear dependencies, this has to be revisited.

@ralfhandl

Copy link
Copy Markdown
ContributorAuthor

this seems to get triggered for any commit to the main branch rather than filtering on the schemas

This action needs to run if

  • one of the YAML files in folder schemas changes,
  • scripts/schema-publish.sh changes,
  • scripts/yaml2json/yaml2json.js changes, or
  • .github/workflows/schema-publish.yaml changes

We could do that with a paths filter in addition to the branches filter, but then the TSC collective mind needs to remember changing this filter if these dependencies change.

Given that the workflow only creates a pull request for publishing the schemas if it actually produces changes compared to gh-pages, I think it is safer and more future-proof to run the workflow on any change to main without a paths filter.

@ralfhandl

Copy link
Copy Markdown
ContributorAuthor

it does not seem to check that the $GITHUB_SHA commit includes at least one schema

According to GitHub Docs on the push and workflow_dispatch events GITHUB_SHA is

Tip commit pushed to the ref

or

Last commit on the GITHUB_REF branch or tag

This seems to indicate that if I

  1. change schema.yaml and commit
  2. change README.md and commit
  3. push

Then the GITHUB_SHA will be the commit changing README.md.

It seems safer to refresh the JSON files based on the date of the last change to the corresponding YAML file and its dependent YAML files.

@handrews

Copy link
Copy Markdown
Member

@ralfhandl

It seems safer to refresh the JSON files based on the date of the last change to the corresponding YAML file and its dependent YAML files.

Yes if we're not filtering the trigger then we need to filter the commits.

@ralfhandl

Copy link
Copy Markdown
ContributorAuthor

Yes if we're not filtering the trigger then we need to filter the commits.

We use the date of the last commit for each file to produce its relevant date, in combination with the new dates of all files it references.

The workflow then creates a pull request for publishing all new/changed/renamed/deleted files.

Git figures out which files actually need to be in the pull request, and if there are none, no pull request is created.

This is the same mechanism we use for publishing the spec HTML files.

@handrews

Copy link
Copy Markdown
Member

@ralfhandl sorry for not finishing up with this yesterday- I was trying to figure out the code and suggest some comments to put in it because I get what you're saying but for some reason I am finding the code really hard to follow. I think the name lastDate is throwing me because while I get why you called it that ,it does not behave like I expect a variable with that name to behave. I expected it to accumulate the very last date across all and then use it, but perhaps you meant "last" in the sense of "previous"?

@ralfhandl

Copy link
Copy Markdown
ContributorAuthor

Changed the name to something hopefully less confusing and added a few comments.

@handrewshandrews left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I find this easier to follow (and I now realize that my previous comment was misleading as I was confused by maxDate more than lastDate), but I'm finding it hard to come up with an improvement so I suppose I'll just stop standing in the way. I don't know why I find this so baffling.

@ralfhandl
ralfhandl merged commit 7e96988 into OAI:mainNov 7, 2024
@ralfhandl
ralfhandl deleted the main-schema-publish branch November 7, 2024 17:04
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

HousekeepingscriptPull requests that update Bash or JavaScript code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@ralfhandl@handrews@miqui
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Schema Publish workflow - #4162

Merged
ralfhandl merged 5 commits into
OAI:mainfrom
ralfhandl:main-schema-publish
Nov 7, 2024
Merged

Schema Publish workflow#4162
ralfhandl merged 5 commits into
OAI:mainfrom
ralfhandl:main-schema-publish

Conversation

@ralfhandl

@ralfhandlralfhandl commented Oct 25, 2024

Copy link
Copy Markdown
Contributor

Follow-up to

Replace WORK-IN-PROGRESS placeholders with date of last change of YAML source:

  • if meta changes, republish all four files
  • if dialect changes, republish it, schema, and schema_base
  • if schema changes, republish it and schema_base
  • if schema_base changes, republish it
  • new date stamp for each schema is the maximum date of last commit in the dependency chain:
flowchart LR
schema_base
schema
dialect
meta
schema --> |default| dialect
schema_base --> |$ref| schema
schema_base --> |$ref| dialect
dialect --> |$ref| meta
Loading
  • GitHub workflow
  • bash script called from workflow
  • Dependencies between schema files
  • Use systematic source schema names

Example PR created by this workflow

@ralfhandl
ralfhandl requested review from a team as code ownersOctober 25, 2024 13:56
@ralfhandlralfhandl added Housekeeping script Pull requests that update Bash or JavaScript code labels Oct 26, 2024

@handrewshandrews left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a little confused because this seems to get triggered for any commit to the main branch rather than filtering on the schemas, and it does not seem to check that the $GITHUB_SHA commit includes at least one schema either.

But I'm not very familiar with either github actions or bash scripting, so what am I missing here?

if [ "$lastCommitDate" \> "$maxDate" ]; then
maxDate=$lastCommitDate
fi
datesHash["$schema"]=$maxDate

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we want each datesHash["$schema"] to have $schema's date, which would be $lastCommitDate and not $maxDate? It's not clear to me what $maxDate is intended to do here.

@ralfhandlralfhandlOct 28, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The schemas are visited in the order of their dependency:

  • If meta changes, dialect needs to be updated. If dialect itself has changed, its new date is the maximum of the two change dates.
  • If dialect changes, schema needs to be updated. If schema itself has changed, its new date is the maximum of the two change dates.
  • If schema changes, schema_base needs to be updated. If schema_base itself has changed, its new date is the maximum of the two change dates.

This is what the loop & $maxDate do because we currently have a linear dependency chain. If we get more files and non-linear dependencies, this has to be revisited.

@ralfhandl

Copy link
Copy Markdown
ContributorAuthor

this seems to get triggered for any commit to the main branch rather than filtering on the schemas

This action needs to run if

  • one of the YAML files in folder schemas changes,
  • scripts/schema-publish.sh changes,
  • scripts/yaml2json/yaml2json.js changes, or
  • .github/workflows/schema-publish.yaml changes

We could do that with a paths filter in addition to the branches filter, but then the TSC collective mind needs to remember changing this filter if these dependencies change.

Given that the workflow only creates a pull request for publishing the schemas if it actually produces changes compared to gh-pages, I think it is safer and more future-proof to run the workflow on any change to main without a paths filter.

@ralfhandl

Copy link
Copy Markdown
ContributorAuthor

it does not seem to check that the $GITHUB_SHA commit includes at least one schema

According to GitHub Docs on the push and workflow_dispatch events GITHUB_SHA is

Tip commit pushed to the ref

or

Last commit on the GITHUB_REF branch or tag

This seems to indicate that if I

  1. change schema.yaml and commit
  2. change README.md and commit
  3. push

Then the GITHUB_SHA will be the commit changing README.md.

It seems safer to refresh the JSON files based on the date of the last change to the corresponding YAML file and its dependent YAML files.

@handrews

Copy link
Copy Markdown
Member

@ralfhandl

It seems safer to refresh the JSON files based on the date of the last change to the corresponding YAML file and its dependent YAML files.

Yes if we're not filtering the trigger then we need to filter the commits.

@ralfhandl

Copy link
Copy Markdown
ContributorAuthor

Yes if we're not filtering the trigger then we need to filter the commits.

We use the date of the last commit for each file to produce its relevant date, in combination with the new dates of all files it references.

The workflow then creates a pull request for publishing all new/changed/renamed/deleted files.

Git figures out which files actually need to be in the pull request, and if there are none, no pull request is created.

This is the same mechanism we use for publishing the spec HTML files.

@handrews

Copy link
Copy Markdown
Member

@ralfhandl sorry for not finishing up with this yesterday- I was trying to figure out the code and suggest some comments to put in it because I get what you're saying but for some reason I am finding the code really hard to follow. I think the name lastDate is throwing me because while I get why you called it that ,it does not behave like I expect a variable with that name to behave. I expected it to accumulate the very last date across all and then use it, but perhaps you meant "last" in the sense of "previous"?

@ralfhandl

Copy link
Copy Markdown
ContributorAuthor

Changed the name to something hopefully less confusing and added a few comments.

@handrewshandrews left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I find this easier to follow (and I now realize that my previous comment was misleading as I was confused by maxDate more than lastDate), but I'm finding it hard to come up with an improvement so I suppose I'll just stop standing in the way. I don't know why I find this so baffling.

@ralfhandl
ralfhandl merged commit 7e96988 into OAI:mainNov 7, 2024
@ralfhandl
ralfhandl deleted the main-schema-publish branch November 7, 2024 17:04
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

HousekeepingscriptPull requests that update Bash or JavaScript code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@ralfhandl@handrews@miqui
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Schema Publish workflow - #4162

Merged
ralfhandl merged 5 commits into
OAI:mainfrom
ralfhandl:main-schema-publish
Nov 7, 2024
Merged

Schema Publish workflow#4162
ralfhandl merged 5 commits into
OAI:mainfrom
ralfhandl:main-schema-publish

Conversation

@ralfhandl

@ralfhandlralfhandl commented Oct 25, 2024

Copy link
Copy Markdown
Contributor

Follow-up to

Replace WORK-IN-PROGRESS placeholders with date of last change of YAML source:

  • if meta changes, republish all four files
  • if dialect changes, republish it, schema, and schema_base
  • if schema changes, republish it and schema_base
  • if schema_base changes, republish it
  • new date stamp for each schema is the maximum date of last commit in the dependency chain:
flowchart LR
schema_base
schema
dialect
meta
schema --> |default| dialect
schema_base --> |$ref| schema
schema_base --> |$ref| dialect
dialect --> |$ref| meta
Loading
  • GitHub workflow
  • bash script called from workflow
  • Dependencies between schema files
  • Use systematic source schema names

Example PR created by this workflow

@ralfhandl
ralfhandl requested review from a team as code ownersOctober 25, 2024 13:56
@ralfhandlralfhandl added Housekeeping script Pull requests that update Bash or JavaScript code labels Oct 26, 2024

@handrewshandrews left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a little confused because this seems to get triggered for any commit to the main branch rather than filtering on the schemas, and it does not seem to check that the $GITHUB_SHA commit includes at least one schema either.

But I'm not very familiar with either github actions or bash scripting, so what am I missing here?

if [ "$lastCommitDate" \> "$maxDate" ]; then
maxDate=$lastCommitDate
fi
datesHash["$schema"]=$maxDate

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we want each datesHash["$schema"] to have $schema's date, which would be $lastCommitDate and not $maxDate? It's not clear to me what $maxDate is intended to do here.

@ralfhandlralfhandlOct 28, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The schemas are visited in the order of their dependency:

  • If meta changes, dialect needs to be updated. If dialect itself has changed, its new date is the maximum of the two change dates.
  • If dialect changes, schema needs to be updated. If schema itself has changed, its new date is the maximum of the two change dates.
  • If schema changes, schema_base needs to be updated. If schema_base itself has changed, its new date is the maximum of the two change dates.

This is what the loop & $maxDate do because we currently have a linear dependency chain. If we get more files and non-linear dependencies, this has to be revisited.

@ralfhandl

Copy link
Copy Markdown
ContributorAuthor

this seems to get triggered for any commit to the main branch rather than filtering on the schemas

This action needs to run if

  • one of the YAML files in folder schemas changes,
  • scripts/schema-publish.sh changes,
  • scripts/yaml2json/yaml2json.js changes, or
  • .github/workflows/schema-publish.yaml changes

We could do that with a paths filter in addition to the branches filter, but then the TSC collective mind needs to remember changing this filter if these dependencies change.

Given that the workflow only creates a pull request for publishing the schemas if it actually produces changes compared to gh-pages, I think it is safer and more future-proof to run the workflow on any change to main without a paths filter.

@ralfhandl

Copy link
Copy Markdown
ContributorAuthor

it does not seem to check that the $GITHUB_SHA commit includes at least one schema

According to GitHub Docs on the push and workflow_dispatch events GITHUB_SHA is

Tip commit pushed to the ref

or

Last commit on the GITHUB_REF branch or tag

This seems to indicate that if I

  1. change schema.yaml and commit
  2. change README.md and commit
  3. push

Then the GITHUB_SHA will be the commit changing README.md.

It seems safer to refresh the JSON files based on the date of the last change to the corresponding YAML file and its dependent YAML files.

@handrews

Copy link
Copy Markdown
Member

@ralfhandl

It seems safer to refresh the JSON files based on the date of the last change to the corresponding YAML file and its dependent YAML files.

Yes if we're not filtering the trigger then we need to filter the commits.

@ralfhandl

Copy link
Copy Markdown
ContributorAuthor

Yes if we're not filtering the trigger then we need to filter the commits.

We use the date of the last commit for each file to produce its relevant date, in combination with the new dates of all files it references.

The workflow then creates a pull request for publishing all new/changed/renamed/deleted files.

Git figures out which files actually need to be in the pull request, and if there are none, no pull request is created.

This is the same mechanism we use for publishing the spec HTML files.

@handrews

Copy link
Copy Markdown
Member

@ralfhandl sorry for not finishing up with this yesterday- I was trying to figure out the code and suggest some comments to put in it because I get what you're saying but for some reason I am finding the code really hard to follow. I think the name lastDate is throwing me because while I get why you called it that ,it does not behave like I expect a variable with that name to behave. I expected it to accumulate the very last date across all and then use it, but perhaps you meant "last" in the sense of "previous"?

@ralfhandl

Copy link
Copy Markdown
ContributorAuthor

Changed the name to something hopefully less confusing and added a few comments.

@handrewshandrews left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I find this easier to follow (and I now realize that my previous comment was misleading as I was confused by maxDate more than lastDate), but I'm finding it hard to come up with an improvement so I suppose I'll just stop standing in the way. I don't know why I find this so baffling.

@ralfhandl
ralfhandl merged commit 7e96988 into OAI:mainNov 7, 2024
@ralfhandl
ralfhandl deleted the main-schema-publish branch November 7, 2024 17:04
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

HousekeepingscriptPull requests that update Bash or JavaScript code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@ralfhandl@handrews@miqui
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Schema Publish workflow - #4162

Merged
ralfhandl merged 5 commits into
OAI:mainfrom
ralfhandl:main-schema-publish
Nov 7, 2024
Merged

Schema Publish workflow#4162
ralfhandl merged 5 commits into
OAI:mainfrom
ralfhandl:main-schema-publish

Conversation

@ralfhandl

@ralfhandlralfhandl commented Oct 25, 2024

Copy link
Copy Markdown
Contributor

Follow-up to

Replace WORK-IN-PROGRESS placeholders with date of last change of YAML source:

  • if meta changes, republish all four files
  • if dialect changes, republish it, schema, and schema_base
  • if schema changes, republish it and schema_base
  • if schema_base changes, republish it
  • new date stamp for each schema is the maximum date of last commit in the dependency chain:
flowchart LR
schema_base
schema
dialect
meta
schema --> |default| dialect
schema_base --> |$ref| schema
schema_base --> |$ref| dialect
dialect --> |$ref| meta
Loading
  • GitHub workflow
  • bash script called from workflow
  • Dependencies between schema files
  • Use systematic source schema names

Example PR created by this workflow

@ralfhandl
ralfhandl requested review from a team as code ownersOctober 25, 2024 13:56
@ralfhandlralfhandl added Housekeeping script Pull requests that update Bash or JavaScript code labels Oct 26, 2024

@handrewshandrews left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a little confused because this seems to get triggered for any commit to the main branch rather than filtering on the schemas, and it does not seem to check that the $GITHUB_SHA commit includes at least one schema either.

But I'm not very familiar with either github actions or bash scripting, so what am I missing here?

if [ "$lastCommitDate" \> "$maxDate" ]; then
maxDate=$lastCommitDate
fi
datesHash["$schema"]=$maxDate

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we want each datesHash["$schema"] to have $schema's date, which would be $lastCommitDate and not $maxDate? It's not clear to me what $maxDate is intended to do here.

@ralfhandlralfhandlOct 28, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The schemas are visited in the order of their dependency:

  • If meta changes, dialect needs to be updated. If dialect itself has changed, its new date is the maximum of the two change dates.
  • If dialect changes, schema needs to be updated. If schema itself has changed, its new date is the maximum of the two change dates.
  • If schema changes, schema_base needs to be updated. If schema_base itself has changed, its new date is the maximum of the two change dates.

This is what the loop & $maxDate do because we currently have a linear dependency chain. If we get more files and non-linear dependencies, this has to be revisited.

@ralfhandl

Copy link
Copy Markdown
ContributorAuthor

this seems to get triggered for any commit to the main branch rather than filtering on the schemas

This action needs to run if

  • one of the YAML files in folder schemas changes,
  • scripts/schema-publish.sh changes,
  • scripts/yaml2json/yaml2json.js changes, or
  • .github/workflows/schema-publish.yaml changes

We could do that with a paths filter in addition to the branches filter, but then the TSC collective mind needs to remember changing this filter if these dependencies change.

Given that the workflow only creates a pull request for publishing the schemas if it actually produces changes compared to gh-pages, I think it is safer and more future-proof to run the workflow on any change to main without a paths filter.

@ralfhandl

Copy link
Copy Markdown
ContributorAuthor

it does not seem to check that the $GITHUB_SHA commit includes at least one schema

According to GitHub Docs on the push and workflow_dispatch events GITHUB_SHA is

Tip commit pushed to the ref

or

Last commit on the GITHUB_REF branch or tag

This seems to indicate that if I

  1. change schema.yaml and commit
  2. change README.md and commit
  3. push

Then the GITHUB_SHA will be the commit changing README.md.

It seems safer to refresh the JSON files based on the date of the last change to the corresponding YAML file and its dependent YAML files.

@handrews

Copy link
Copy Markdown
Member

@ralfhandl

It seems safer to refresh the JSON files based on the date of the last change to the corresponding YAML file and its dependent YAML files.

Yes if we're not filtering the trigger then we need to filter the commits.

@ralfhandl

Copy link
Copy Markdown
ContributorAuthor

Yes if we're not filtering the trigger then we need to filter the commits.

We use the date of the last commit for each file to produce its relevant date, in combination with the new dates of all files it references.

The workflow then creates a pull request for publishing all new/changed/renamed/deleted files.

Git figures out which files actually need to be in the pull request, and if there are none, no pull request is created.

This is the same mechanism we use for publishing the spec HTML files.

@handrews

Copy link
Copy Markdown
Member

@ralfhandl sorry for not finishing up with this yesterday- I was trying to figure out the code and suggest some comments to put in it because I get what you're saying but for some reason I am finding the code really hard to follow. I think the name lastDate is throwing me because while I get why you called it that ,it does not behave like I expect a variable with that name to behave. I expected it to accumulate the very last date across all and then use it, but perhaps you meant "last" in the sense of "previous"?

@ralfhandl

Copy link
Copy Markdown
ContributorAuthor

Changed the name to something hopefully less confusing and added a few comments.

@handrewshandrews left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I find this easier to follow (and I now realize that my previous comment was misleading as I was confused by maxDate more than lastDate), but I'm finding it hard to come up with an improvement so I suppose I'll just stop standing in the way. I don't know why I find this so baffling.

@ralfhandl
ralfhandl merged commit 7e96988 into OAI:mainNov 7, 2024
@ralfhandl
ralfhandl deleted the main-schema-publish branch November 7, 2024 17:04
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

HousekeepingscriptPull requests that update Bash or JavaScript code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@ralfhandl@handrews@miqui
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Schema Publish workflow - #4162

Merged
ralfhandl merged 5 commits into
OAI:mainfrom
ralfhandl:main-schema-publish
Nov 7, 2024
Merged

Schema Publish workflow#4162
ralfhandl merged 5 commits into
OAI:mainfrom
ralfhandl:main-schema-publish

Conversation

@ralfhandl

@ralfhandlralfhandl commented Oct 25, 2024

Copy link
Copy Markdown
Contributor

Follow-up to

Replace WORK-IN-PROGRESS placeholders with date of last change of YAML source:

  • if meta changes, republish all four files
  • if dialect changes, republish it, schema, and schema_base
  • if schema changes, republish it and schema_base
  • if schema_base changes, republish it
  • new date stamp for each schema is the maximum date of last commit in the dependency chain:
flowchart LR
schema_base
schema
dialect
meta
schema --> |default| dialect
schema_base --> |$ref| schema
schema_base --> |$ref| dialect
dialect --> |$ref| meta
Loading
  • GitHub workflow
  • bash script called from workflow
  • Dependencies between schema files
  • Use systematic source schema names

Example PR created by this workflow

@ralfhandl
ralfhandl requested review from a team as code ownersOctober 25, 2024 13:56
@ralfhandlralfhandl added Housekeeping script Pull requests that update Bash or JavaScript code labels Oct 26, 2024

@handrewshandrews left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a little confused because this seems to get triggered for any commit to the main branch rather than filtering on the schemas, and it does not seem to check that the $GITHUB_SHA commit includes at least one schema either.

But I'm not very familiar with either github actions or bash scripting, so what am I missing here?

if [ "$lastCommitDate" \> "$maxDate" ]; then
maxDate=$lastCommitDate
fi
datesHash["$schema"]=$maxDate

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we want each datesHash["$schema"] to have $schema's date, which would be $lastCommitDate and not $maxDate? It's not clear to me what $maxDate is intended to do here.

@ralfhandlralfhandlOct 28, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The schemas are visited in the order of their dependency:

  • If meta changes, dialect needs to be updated. If dialect itself has changed, its new date is the maximum of the two change dates.
  • If dialect changes, schema needs to be updated. If schema itself has changed, its new date is the maximum of the two change dates.
  • If schema changes, schema_base needs to be updated. If schema_base itself has changed, its new date is the maximum of the two change dates.

This is what the loop & $maxDate do because we currently have a linear dependency chain. If we get more files and non-linear dependencies, this has to be revisited.

@ralfhandl

Copy link
Copy Markdown
ContributorAuthor

this seems to get triggered for any commit to the main branch rather than filtering on the schemas

This action needs to run if

  • one of the YAML files in folder schemas changes,
  • scripts/schema-publish.sh changes,
  • scripts/yaml2json/yaml2json.js changes, or
  • .github/workflows/schema-publish.yaml changes

We could do that with a paths filter in addition to the branches filter, but then the TSC collective mind needs to remember changing this filter if these dependencies change.

Given that the workflow only creates a pull request for publishing the schemas if it actually produces changes compared to gh-pages, I think it is safer and more future-proof to run the workflow on any change to main without a paths filter.

@ralfhandl

Copy link
Copy Markdown
ContributorAuthor

it does not seem to check that the $GITHUB_SHA commit includes at least one schema

According to GitHub Docs on the push and workflow_dispatch events GITHUB_SHA is

Tip commit pushed to the ref

or

Last commit on the GITHUB_REF branch or tag

This seems to indicate that if I

  1. change schema.yaml and commit
  2. change README.md and commit
  3. push

Then the GITHUB_SHA will be the commit changing README.md.

It seems safer to refresh the JSON files based on the date of the last change to the corresponding YAML file and its dependent YAML files.

@handrews

Copy link
Copy Markdown
Member

@ralfhandl

It seems safer to refresh the JSON files based on the date of the last change to the corresponding YAML file and its dependent YAML files.

Yes if we're not filtering the trigger then we need to filter the commits.

@ralfhandl

Copy link
Copy Markdown
ContributorAuthor

Yes if we're not filtering the trigger then we need to filter the commits.

We use the date of the last commit for each file to produce its relevant date, in combination with the new dates of all files it references.

The workflow then creates a pull request for publishing all new/changed/renamed/deleted files.

Git figures out which files actually need to be in the pull request, and if there are none, no pull request is created.

This is the same mechanism we use for publishing the spec HTML files.

@handrews

Copy link
Copy Markdown
Member

@ralfhandl sorry for not finishing up with this yesterday- I was trying to figure out the code and suggest some comments to put in it because I get what you're saying but for some reason I am finding the code really hard to follow. I think the name lastDate is throwing me because while I get why you called it that ,it does not behave like I expect a variable with that name to behave. I expected it to accumulate the very last date across all and then use it, but perhaps you meant "last" in the sense of "previous"?

@ralfhandl

Copy link
Copy Markdown
ContributorAuthor

Changed the name to something hopefully less confusing and added a few comments.

@handrewshandrews left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I find this easier to follow (and I now realize that my previous comment was misleading as I was confused by maxDate more than lastDate), but I'm finding it hard to come up with an improvement so I suppose I'll just stop standing in the way. I don't know why I find this so baffling.

@ralfhandl
ralfhandl merged commit 7e96988 into OAI:mainNov 7, 2024
@ralfhandl
ralfhandl deleted the main-schema-publish branch November 7, 2024 17:04
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

HousekeepingscriptPull requests that update Bash or JavaScript code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@ralfhandl@handrews@miqui
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Schema Publish workflow - #4162

Merged
ralfhandl merged 5 commits into
OAI:mainfrom
ralfhandl:main-schema-publish
Nov 7, 2024
Merged

Schema Publish workflow#4162
ralfhandl merged 5 commits into
OAI:mainfrom
ralfhandl:main-schema-publish

Conversation

@ralfhandl

@ralfhandlralfhandl commented Oct 25, 2024

Copy link
Copy Markdown
Contributor

Follow-up to

Replace WORK-IN-PROGRESS placeholders with date of last change of YAML source:

  • if meta changes, republish all four files
  • if dialect changes, republish it, schema, and schema_base
  • if schema changes, republish it and schema_base
  • if schema_base changes, republish it
  • new date stamp for each schema is the maximum date of last commit in the dependency chain:
flowchart LR
schema_base
schema
dialect
meta
schema --> |default| dialect
schema_base --> |$ref| schema
schema_base --> |$ref| dialect
dialect --> |$ref| meta
Loading
  • GitHub workflow
  • bash script called from workflow
  • Dependencies between schema files
  • Use systematic source schema names

Example PR created by this workflow

@ralfhandl
ralfhandl requested review from a team as code ownersOctober 25, 2024 13:56
@ralfhandlralfhandl added Housekeeping script Pull requests that update Bash or JavaScript code labels Oct 26, 2024

@handrewshandrews left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a little confused because this seems to get triggered for any commit to the main branch rather than filtering on the schemas, and it does not seem to check that the $GITHUB_SHA commit includes at least one schema either.

But I'm not very familiar with either github actions or bash scripting, so what am I missing here?

if [ "$lastCommitDate" \> "$maxDate" ]; then
maxDate=$lastCommitDate
fi
datesHash["$schema"]=$maxDate

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we want each datesHash["$schema"] to have $schema's date, which would be $lastCommitDate and not $maxDate? It's not clear to me what $maxDate is intended to do here.

@ralfhandlralfhandlOct 28, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The schemas are visited in the order of their dependency:

  • If meta changes, dialect needs to be updated. If dialect itself has changed, its new date is the maximum of the two change dates.
  • If dialect changes, schema needs to be updated. If schema itself has changed, its new date is the maximum of the two change dates.
  • If schema changes, schema_base needs to be updated. If schema_base itself has changed, its new date is the maximum of the two change dates.

This is what the loop & $maxDate do because we currently have a linear dependency chain. If we get more files and non-linear dependencies, this has to be revisited.

@ralfhandl

Copy link
Copy Markdown
ContributorAuthor

this seems to get triggered for any commit to the main branch rather than filtering on the schemas

This action needs to run if

  • one of the YAML files in folder schemas changes,
  • scripts/schema-publish.sh changes,
  • scripts/yaml2json/yaml2json.js changes, or
  • .github/workflows/schema-publish.yaml changes

We could do that with a paths filter in addition to the branches filter, but then the TSC collective mind needs to remember changing this filter if these dependencies change.

Given that the workflow only creates a pull request for publishing the schemas if it actually produces changes compared to gh-pages, I think it is safer and more future-proof to run the workflow on any change to main without a paths filter.

@ralfhandl

Copy link
Copy Markdown
ContributorAuthor

it does not seem to check that the $GITHUB_SHA commit includes at least one schema

According to GitHub Docs on the push and workflow_dispatch events GITHUB_SHA is

Tip commit pushed to the ref

or

Last commit on the GITHUB_REF branch or tag

This seems to indicate that if I

  1. change schema.yaml and commit
  2. change README.md and commit
  3. push

Then the GITHUB_SHA will be the commit changing README.md.

It seems safer to refresh the JSON files based on the date of the last change to the corresponding YAML file and its dependent YAML files.

@handrews

Copy link
Copy Markdown
Member

@ralfhandl

It seems safer to refresh the JSON files based on the date of the last change to the corresponding YAML file and its dependent YAML files.

Yes if we're not filtering the trigger then we need to filter the commits.

@ralfhandl

Copy link
Copy Markdown
ContributorAuthor

Yes if we're not filtering the trigger then we need to filter the commits.

We use the date of the last commit for each file to produce its relevant date, in combination with the new dates of all files it references.

The workflow then creates a pull request for publishing all new/changed/renamed/deleted files.

Git figures out which files actually need to be in the pull request, and if there are none, no pull request is created.

This is the same mechanism we use for publishing the spec HTML files.

@handrews

Copy link
Copy Markdown
Member

@ralfhandl sorry for not finishing up with this yesterday- I was trying to figure out the code and suggest some comments to put in it because I get what you're saying but for some reason I am finding the code really hard to follow. I think the name lastDate is throwing me because while I get why you called it that ,it does not behave like I expect a variable with that name to behave. I expected it to accumulate the very last date across all and then use it, but perhaps you meant "last" in the sense of "previous"?

@ralfhandl

Copy link
Copy Markdown
ContributorAuthor

Changed the name to something hopefully less confusing and added a few comments.

@handrewshandrews left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I find this easier to follow (and I now realize that my previous comment was misleading as I was confused by maxDate more than lastDate), but I'm finding it hard to come up with an improvement so I suppose I'll just stop standing in the way. I don't know why I find this so baffling.

@ralfhandl
ralfhandl merged commit 7e96988 into OAI:mainNov 7, 2024
@ralfhandl
ralfhandl deleted the main-schema-publish branch November 7, 2024 17:04
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

HousekeepingscriptPull requests that update Bash or JavaScript code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@ralfhandl@handrews@miqui
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Schema Publish workflow - #4162

Merged
ralfhandl merged 5 commits into
OAI:mainfrom
ralfhandl:main-schema-publish
Nov 7, 2024
Merged

Schema Publish workflow#4162
ralfhandl merged 5 commits into
OAI:mainfrom
ralfhandl:main-schema-publish

Conversation

@ralfhandl

@ralfhandlralfhandl commented Oct 25, 2024

Copy link
Copy Markdown
Contributor

Follow-up to

Replace WORK-IN-PROGRESS placeholders with date of last change of YAML source:

  • if meta changes, republish all four files
  • if dialect changes, republish it, schema, and schema_base
  • if schema changes, republish it and schema_base
  • if schema_base changes, republish it
  • new date stamp for each schema is the maximum date of last commit in the dependency chain:
flowchart LR
schema_base
schema
dialect
meta
schema --> |default| dialect
schema_base --> |$ref| schema
schema_base --> |$ref| dialect
dialect --> |$ref| meta
Loading
  • GitHub workflow
  • bash script called from workflow
  • Dependencies between schema files
  • Use systematic source schema names

Example PR created by this workflow

@ralfhandl
ralfhandl requested review from a team as code ownersOctober 25, 2024 13:56
@ralfhandlralfhandl added Housekeeping script Pull requests that update Bash or JavaScript code labels Oct 26, 2024

@handrewshandrews left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a little confused because this seems to get triggered for any commit to the main branch rather than filtering on the schemas, and it does not seem to check that the $GITHUB_SHA commit includes at least one schema either.

But I'm not very familiar with either github actions or bash scripting, so what am I missing here?

if [ "$lastCommitDate" \> "$maxDate" ]; then
maxDate=$lastCommitDate
fi
datesHash["$schema"]=$maxDate

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we want each datesHash["$schema"] to have $schema's date, which would be $lastCommitDate and not $maxDate? It's not clear to me what $maxDate is intended to do here.

@ralfhandlralfhandlOct 28, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The schemas are visited in the order of their dependency:

  • If meta changes, dialect needs to be updated. If dialect itself has changed, its new date is the maximum of the two change dates.
  • If dialect changes, schema needs to be updated. If schema itself has changed, its new date is the maximum of the two change dates.
  • If schema changes, schema_base needs to be updated. If schema_base itself has changed, its new date is the maximum of the two change dates.

This is what the loop & $maxDate do because we currently have a linear dependency chain. If we get more files and non-linear dependencies, this has to be revisited.

@ralfhandl

Copy link
Copy Markdown
ContributorAuthor

this seems to get triggered for any commit to the main branch rather than filtering on the schemas

This action needs to run if

  • one of the YAML files in folder schemas changes,
  • scripts/schema-publish.sh changes,
  • scripts/yaml2json/yaml2json.js changes, or
  • .github/workflows/schema-publish.yaml changes

We could do that with a paths filter in addition to the branches filter, but then the TSC collective mind needs to remember changing this filter if these dependencies change.

Given that the workflow only creates a pull request for publishing the schemas if it actually produces changes compared to gh-pages, I think it is safer and more future-proof to run the workflow on any change to main without a paths filter.

@ralfhandl

Copy link
Copy Markdown
ContributorAuthor

it does not seem to check that the $GITHUB_SHA commit includes at least one schema

According to GitHub Docs on the push and workflow_dispatch events GITHUB_SHA is

Tip commit pushed to the ref

or

Last commit on the GITHUB_REF branch or tag

This seems to indicate that if I

  1. change schema.yaml and commit
  2. change README.md and commit
  3. push

Then the GITHUB_SHA will be the commit changing README.md.

It seems safer to refresh the JSON files based on the date of the last change to the corresponding YAML file and its dependent YAML files.

@handrews

Copy link
Copy Markdown
Member

@ralfhandl

It seems safer to refresh the JSON files based on the date of the last change to the corresponding YAML file and its dependent YAML files.

Yes if we're not filtering the trigger then we need to filter the commits.

@ralfhandl

Copy link
Copy Markdown
ContributorAuthor

Yes if we're not filtering the trigger then we need to filter the commits.

We use the date of the last commit for each file to produce its relevant date, in combination with the new dates of all files it references.

The workflow then creates a pull request for publishing all new/changed/renamed/deleted files.

Git figures out which files actually need to be in the pull request, and if there are none, no pull request is created.

This is the same mechanism we use for publishing the spec HTML files.

@handrews

Copy link
Copy Markdown
Member

@ralfhandl sorry for not finishing up with this yesterday- I was trying to figure out the code and suggest some comments to put in it because I get what you're saying but for some reason I am finding the code really hard to follow. I think the name lastDate is throwing me because while I get why you called it that ,it does not behave like I expect a variable with that name to behave. I expected it to accumulate the very last date across all and then use it, but perhaps you meant "last" in the sense of "previous"?

@ralfhandl

Copy link
Copy Markdown
ContributorAuthor

Changed the name to something hopefully less confusing and added a few comments.

@handrewshandrews left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I find this easier to follow (and I now realize that my previous comment was misleading as I was confused by maxDate more than lastDate), but I'm finding it hard to come up with an improvement so I suppose I'll just stop standing in the way. I don't know why I find this so baffling.

@ralfhandl
ralfhandl merged commit 7e96988 into OAI:mainNov 7, 2024
@ralfhandl
ralfhandl deleted the main-schema-publish branch November 7, 2024 17:04
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

HousekeepingscriptPull requests that update Bash or JavaScript code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@ralfhandl@handrews@miqui