diff --git a/.github/actions-scripts/content-changes-table-comment.js b/.github/actions-scripts/content-changes-table-comment.js index 32400b46c8..4aecea4709 100755 --- a/.github/actions-scripts/content-changes-table-comment.js +++ b/.github/actions-scripts/content-changes-table-comment.js @@ -2,7 +2,6 @@ import * as github from '@actions/github' import { setOutput } from '@actions/core' -import got from 'got' import { getContents } from '../../script/helpers/git-utils.js' import parse from '../../lib/read-frontmatter.js' @@ -48,13 +47,6 @@ const articleFiles = files.filter( const lines = await Promise.all( articleFiles.map(async (file) => { - // Action triggered on PR and after preview env is deployed. Check health to determine if preview env is ready (healthy) - let appUrlIsHealthy = false - try { - const res = await got.head(`${APP_URL}/healthz`, { retry: { limit: 0 } }) - appUrlIsHealthy = res.statusCode === 200 - } catch (err) {} - const sourceUrl = file.blob_url const fileName = file.filename.slice(pathPrefix.length) const fileUrl = fileName.slice(0, fileName.lastIndexOf('.')) @@ -78,8 +70,7 @@ const lines = await Promise.all( const { data } = parse(fileContents) let contentCell = '' - let previewCell = appUrlIsHealthy ? '' : '_Deployment pending..._' - + let previewCell = '' let prodCell = '' if (file.status === 'added') contentCell = 'New file: ' @@ -107,16 +98,12 @@ const lines = await Promise.all( if (versions.toString() === nonEnterpriseDefaultVersion) { // omit version from fpt url - previewCell += appUrlIsHealthy ? `[${plan}](${APP_URL}/${fileUrl})
` : '' + previewCell += `[${plan}](${APP_URL}/${fileUrl})
` prodCell += `[${plan}](${PROD_URL}/${fileUrl})
` } else { // for non-versioned releases (ghae, ghec) use full url - if (appUrlIsHealthy) { - previewCell += appUrlIsHealthy - ? `[${plan}](${APP_URL}/${versions}/${fileUrl})
` - : '' - } + previewCell += `[${plan}](${APP_URL}/${versions}/${fileUrl})
` prodCell += `[${plan}](${PROD_URL}/${versions}/${fileUrl})
` } } else if (versions.length) { @@ -126,9 +113,7 @@ const lines = await Promise.all( prodCell += `${plan}@ ` versions.forEach((version) => { - previewCell += appUrlIsHealthy - ? `[${version.split('@')[1]}](${APP_URL}/${version}/${fileUrl}) ` - : '' + previewCell += `[${version.split('@')[1]}](${APP_URL}/${version}/${fileUrl}) ` prodCell += `[${version.split('@')[1]}](${PROD_URL}/${version}/${fileUrl}) ` }) previewCell += '
' diff --git a/.github/workflows/content-changes-table-comment.yml b/.github/workflows/content-changes-table-comment.yml index 355af58d08..51fa2ce095 100644 --- a/.github/workflows/content-changes-table-comment.yml +++ b/.github/workflows/content-changes-table-comment.yml @@ -5,10 +5,6 @@ name: Content Changes Table Comment # **Who does it impact**: docs-internal/docs maintainers and contributors on: - # Trigger this workflow after preview deployment runs - workflow_run: - workflows: - - Azure - Deploy Preview Environment workflow_dispatch: pull_request_target: @@ -44,6 +40,7 @@ jobs: filters: | filterContentDir: - 'content/**/*' + filterContentDir: needs: PR-Preview-Links if: ${{ needs.PR-Preview-Links.outputs.filterContentDir == 'true' }} diff --git a/data/graphql/ghae/schema.docs-ghae.graphql b/data/graphql/ghae/schema.docs-ghae.graphql index ce80c04a29..285927fa3f 100644 --- a/data/graphql/ghae/schema.docs-ghae.graphql +++ b/data/graphql/ghae/schema.docs-ghae.graphql @@ -35993,6 +35993,11 @@ input StartRepositoryMigrationInput { The Octoshift migration source repository URL. """ sourceRepositoryUrl: URI! + + """ + The visibility of the imported repository. + """ + targetRepoVisibility: String } """ diff --git a/data/graphql/ghec/schema.docs.graphql b/data/graphql/ghec/schema.docs.graphql index 22e1734373..708e999360 100644 --- a/data/graphql/ghec/schema.docs.graphql +++ b/data/graphql/ghec/schema.docs.graphql @@ -44951,6 +44951,11 @@ input StartRepositoryMigrationInput { The Octoshift migration source repository URL. """ sourceRepositoryUrl: URI! + + """ + The visibility of the imported repository. + """ + targetRepoVisibility: String } """ diff --git a/data/graphql/schema.docs.graphql b/data/graphql/schema.docs.graphql index 22e1734373..708e999360 100644 --- a/data/graphql/schema.docs.graphql +++ b/data/graphql/schema.docs.graphql @@ -44951,6 +44951,11 @@ input StartRepositoryMigrationInput { The Octoshift migration source repository URL. """ sourceRepositoryUrl: URI! + + """ + The visibility of the imported repository. + """ + targetRepoVisibility: String } """ diff --git a/lib/graphql/static/changelog.json b/lib/graphql/static/changelog.json index 80967238b1..45188695c9 100644 --- a/lib/graphql/static/changelog.json +++ b/lib/graphql/static/changelog.json @@ -1,4 +1,17 @@ [ + { + "schemaChanges": [ + { + "title": "The GraphQL schema includes these changes:", + "changes": [ + "

Input field targetRepoVisibility was added to input object type StartRepositoryMigrationInput

" + ] + } + ], + "previewChanges": [], + "upcomingChanges": [], + "date": "2022-08-11" + }, { "schemaChanges": [ { diff --git a/lib/graphql/static/schema-dotcom.json b/lib/graphql/static/schema-dotcom.json index 0a2f50f7b1..a1b7d83de1 100644 --- a/lib/graphql/static/schema-dotcom.json +++ b/lib/graphql/static/schema-dotcom.json @@ -86910,6 +86910,14 @@ "id": "uri", "kind": "scalars", "href": "/graphql/reference/scalars#uri" + }, + { + "name": "targetRepoVisibility", + "description": "

The visibility of the imported repository.

", + "type": "String", + "id": "string", + "kind": "scalars", + "href": "/graphql/reference/scalars#string" } ] }, diff --git a/lib/graphql/static/schema-ghae.json b/lib/graphql/static/schema-ghae.json index 3701a23334..f9e686e69a 100644 --- a/lib/graphql/static/schema-ghae.json +++ b/lib/graphql/static/schema-ghae.json @@ -70702,6 +70702,14 @@ "id": "uri", "kind": "scalars", "href": "/graphql/reference/scalars#uri" + }, + { + "name": "targetRepoVisibility", + "description": "

The visibility of the imported repository.

", + "type": "String", + "id": "string", + "kind": "scalars", + "href": "/graphql/reference/scalars#string" } ] }, diff --git a/lib/graphql/static/schema-ghec.json b/lib/graphql/static/schema-ghec.json index 0a2f50f7b1..a1b7d83de1 100644 --- a/lib/graphql/static/schema-ghec.json +++ b/lib/graphql/static/schema-ghec.json @@ -86910,6 +86910,14 @@ "id": "uri", "kind": "scalars", "href": "/graphql/reference/scalars#uri" + }, + { + "name": "targetRepoVisibility", + "description": "

The visibility of the imported repository.

", + "type": "String", + "id": "string", + "kind": "scalars", + "href": "/graphql/reference/scalars#string" } ] },