From cccb21e7cb922b338fb48f3b00f84d53834d3d16 Mon Sep 17 00:00:00 2001 From: Nikita Wootten Date: Wed, 27 Mar 2024 21:33:33 -0400 Subject: [PATCH 1/3] Amend `list_revisions.sh` to include post 1.0 pre-releases --- support/list_revisions.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/support/list_revisions.sh b/support/list_revisions.sh index 572bbe403..620777181 100755 --- a/support/list_revisions.sh +++ b/support/list_revisions.sh @@ -11,8 +11,10 @@ OSCAL_DIR="${ROOT_DIR}/support/OSCAL" TAGS=$(cd "${OSCAL_DIR}"; git tag) # filter out non-version tags (anything that isn't in a vX.X.X, milestones, release candidates, etc.) -TAGGED_REVISIONS=$(echo "${TAGS}" | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$') +TAGGED_REVISIONS=$(echo "${TAGS}" | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+(-\S+)?$') # sort tags (which should be in semver-ish format) TAGGED_REVISIONS=$(echo "${TAGGED_REVISIONS}" | sort -t "." -k1,1n -k2,2n -k3,3n) +# Filter out pre-1.0 pre-releases +TAGGED_REVISIONS=$(echo "${TAGGED_REVISIONS}" | grep -v -E '^v1\.0\.0-.*') echo "${TAGGED_REVISIONS}" From 077c7363dee19949b121f4e2e624876e3f40f99d Mon Sep 17 00:00:00 2001 From: Nikita Wootten Date: Sat, 30 Mar 2024 20:57:14 -0400 Subject: [PATCH 2/3] Fix serve target --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d1b2e98cf..2c1beba65 100644 --- a/Makefile +++ b/Makefile @@ -48,8 +48,7 @@ environment: .PHONY: serve serve: modeldoc release-assets ## Spin up a static web server for local dev - cd site - hugo serve + cd site && hugo serve .PHONY: site site: $(SITE_OUTPUT_DIR) ## Build the site @@ -116,4 +115,4 @@ list-tags: ## List OSCAL tagged releases .PHONY: list-prototype-branches list-prototype-branches: ## List OSCAL prototype branches for publication - ./support/list_branches.sh $(PROTOTYPE_BRANCHES_REMOTE) $(PROTOTYPE_BRANCHES_PREFIX) \ No newline at end of file + ./support/list_branches.sh $(PROTOTYPE_BRANCHES_REMOTE) $(PROTOTYPE_BRANCHES_PREFIX) From f7cde2c3d580e8d5890694e3f8e0105d620ce70e Mon Sep 17 00:00:00 2001 From: Nikita Wootten Date: Sat, 30 Mar 2024 21:01:03 -0400 Subject: [PATCH 3/3] Deprecation support --- site/assets/scss/schema-docs.scss | 4 ++++ support/metaschema-xslt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/site/assets/scss/schema-docs.scss b/site/assets/scss/schema-docs.scss index 8c4b58e21..51dc9dc2f 100644 --- a/site/assets/scss/schema-docs.scss +++ b/site/assets/scss/schema-docs.scss @@ -360,3 +360,7 @@ font-family: anchorjs-icons; background-image: "⚓"; } + +.OM-name-deprecated { + text-decoration: line-through; +} diff --git a/support/metaschema-xslt b/support/metaschema-xslt index bd4359a03..f3722c72c 160000 --- a/support/metaschema-xslt +++ b/support/metaschema-xslt @@ -1 +1 @@ -Subproject commit bd4359a0354d3a9452633a8ed915ec9e915d5431 +Subproject commit f3722c72cc9b12fd5668dfda695d32a39b0a7d61