Merge pull request #26208 from github/repo-sync

Repo sync

Author: docs-bot

.github/workflows/test.yml

@@ -49,7 +49,6 @@ jobs:
               { name: 'graphql', path: 'src/graphql/tests', },
               { name: 'landings', path: 'src/landings/tests', },
               { name: 'linting', path: 'src/content-linter/tests', },
-              { name: 'meta', path: 'tests/meta', },
               { name: 'observability', path: 'src/observability/tests' },
               { name: 'pageinfo', path: 'src/pageinfo/tests', },
               { name: 'rendering', path: 'tests/rendering', },

contributing/code-annotations.md

@@ -17,7 +17,7 @@ For more experienced users, code annotations can help them understand a code exa
 
 An annotated code example must start with a single line annotation. You can start with a blank annotation if you do not want to add an annotation to the first line of code.
 
-You must use the comment tag for the language that the code sample is written in. For example, `#` for YAML and `//` for Ruby.
+You must use the comment tag for the language that the code sample is written in. For example, `#` for YAML and `//` for JavaScript.
 
 To enable code sample annotations, you must specify a language followed by the word `annotate` after the starting triple backtick code tag.
 

lib/enterprise-server-releases.js

@@ -12,7 +12,7 @@ export const dates = JSON.parse(await fs.readFile('src/ghes-releases/lib/enterpr
 export const next = '3.10'
 export const nextNext = '3.11'
 
-export const supported = ['3.9', '3.8', '3.7', '3.6', '3.5', '3.4']
+export const supported = ['3.9', '3.8', '3.7', '3.6', '3.5']
 
 // Ensure that:
 // "next" is ahead of "latest" by one minor or major release.
@@ -37,7 +37,7 @@ function isValidNext(v1, v2) {
 // When you're archiving a version, add the new archived number to this
 // array and you should never need to touch the `deprecated` array
 // on the line just below.
-export const deprecatedWithFunctionalRedirects = ['3.3', '3.2', '3.1', '3.0']
+export const deprecatedWithFunctionalRedirects = ['3.4', '3.3', '3.2', '3.1', '3.0']
 export const deprecated = [
   ...deprecatedWithFunctionalRedirects,
   '2.22',

src/content-linter/tests/lint-versioning.js

@@ -157,6 +157,7 @@ function validateIfversionConditionals(conds) {
         // allows us to deprecate the version before removing
         // the old liquid content.
         if (
+          version !== 'ghae' &&
           !(
             supported.includes(release) ||
             release === next ||

src/rest/scripts/test-open-api-schema.js

@@ -13,6 +13,7 @@ import frontmatter from '../../../lib/read-frontmatter.js'
 import getApplicableVersions from '../../../lib/get-applicable-versions.js'
 import { allVersions, getDocsVersion } from '../../../lib/all-versions.js'
 import { REST_DATA_DIR, REST_SCHEMA_FILENAME } from '../lib/index.js'
+import { deprecated } from '../../../lib/enterprise-server-releases.js'
 
 const contentFiles = []
 
@@ -52,7 +53,11 @@ export async function getDiffOpenAPIContentRest() {
 
 async function createOpenAPISchemasCheck() {
   const openAPICheck = createCheckObj()
-  const restDirectory = fs.readdirSync(REST_DATA_DIR).filter((dir) => !dir.endsWith('.json'))
+  const restDirectory = fs
+    .readdirSync(REST_DATA_DIR)
+    .filter((dir) => !dir.endsWith('.json'))
+    // Allow the most recent deprecation to exist on disk until fully deprecated
+    .filter((dir) => !dir.includes(deprecated[0]))
 
   restDirectory.forEach((dir) => {
     const filename = path.join(REST_DATA_DIR, dir, REST_SCHEMA_FILENAME)

tests/fixtures/content/get-started/liquid/ifversion.md

@@ -67,7 +67,7 @@ condition-l
 
 {% ifversion ghes %}
 condition-m
-  {% ifversion ghes = 3.4 %}
+  {% ifversion ghes = 3.5 %}
   condition-n
   {% endif %}
 {% endif %}

tests/meta/orphan-tests.js

@@ -154,15 +154,6 @@ describe('extended Markdown', () => {
       'condition-l',
     ],
     'enterprise-cloud@latest': ['condition-c', 'condition-j', 'condition-l'],
-    '[email protected]': [
-      'condition-c',
-      'condition-e',
-      'condition-g',
-      'condition-i',
-      'condition-j',
-      'condition-m',
-      'condition-n',
-    ],
     '[email protected]': [
       'condition-c',
       'condition-e',
@@ -172,6 +163,7 @@ describe('extended Markdown', () => {
       'condition-i',
       'condition-k',
       'condition-m',
+      'condition-n',
       'condition-o',
     ],
     '[email protected]': [