Added token data type to datatypes.

Updating Github actions workflows to prevent deployment.
danielnaab · Jun 7, 2021 · 2c2b241 · 2c2b241
1 parent d54e6d4
commit 2c2b241
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/.github/workflows/metaschema-artifacts.yml b/.github/workflows/metaschema-artifacts.yml
@@ -267,9 +267,9 @@ jobs:
 #          cd "${OSCAL_WEBSITE_PATH}"
 #          #--allow-hash-href
 #          bundle exec htmlproofer --check-external-hash public/ --url-swap "https\://pages.nist.gov/OSCAL/:/" --assume-extension --log-level :debug --url-ignore "/\/OSCAL\/docs\/\/reference\/[^/]+\/[^/]+\/(?:json|xml)-(?:outline|reference|index|definitions)/,/#/,/pages.nist.gov\/(?:nist-header-footer|leaveNotice)\/.+/"
-      - name: Run deploy script
-        if: ${{ github.repository == env.HOME_REPO && github.ref == format('refs/heads/{0}',env.HOME_BRANCH) }}
-        run: |
-            cd "$OSCAL_WEBSITE_PATH"
-            git config user.name "Deployment Bot"
-            bash ./deploy.sh --push-only -v -m "Deploying website [ci deploy skip]"
+#      - name: Run deploy script
+#        if: ${{ github.repository == env.HOME_REPO && github.ref == format('refs/heads/{0}',env.HOME_BRANCH) }}
+#        run: |
+#            cd "$OSCAL_WEBSITE_PATH"
+#            git config user.name "Deployment Bot"
+#            bash ./deploy.sh --push-only -v -m "Deploying website [ci deploy skip]"
diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
@@ -1,7 +1,8 @@
 on:
   push:
     branches:
-      - feature-documentation-redesign-2021-05
+      - main
+      - develop
     paths:
       - 'docs/**'
       - '.github/workflows/website.yml'
@@ -12,7 +13,7 @@ name: Build and Publish Website
 env:
   # the name of the repo
   HOME_REPO: usnistgov/OSCAL
-  HOME_BRANCH: feature-documentation-redesign-2021-05
+  HOME_BRANCH: main
   # dependency versions
   HUGO_VERSION: 0.83.1
   # build-specific environment

diff --git a/docs/content/reference/datatypes.md b/docs/content/reference/datatypes.md
@@ -38,6 +38,10 @@ A boolean value mapped in XML, JSON, and YAML as follows:
 
 A string of Unicode characters.
 
+### token
+
+A non-colonized name as defined by [XML Schema Part 2: Datatypes Second Edition](https://www.w3.org/TR/xmlschema11-2/#NCName).
+
 ### NCName
 
 A non-colonized name as defined by [XML Schema Part 2: Datatypes Second Edition](https://www.w3.org/TR/xmlschema11-2/#NCName).