diff --git a/data/reusables/actions/jobs/choosing-runner-overview.md b/data/reusables/actions/jobs/choosing-runner-overview.md index c6edd4ffe61e..dbf1c015d59b 100644 --- a/data/reusables/actions/jobs/choosing-runner-overview.md +++ b/data/reusables/actions/jobs/choosing-runner-overview.md @@ -1,7 +1,6 @@ Use `jobs..runs-on` to define the type of machine to run the job on. -{% ifversion fpt or ghec %}- The destination machine can be either a [{% data variables.product.prodname_dotcom %}-hosted runner](#choosing-github-hosted-runners), [{% data variables.actions.hosted_runner %}](#choosing-runners-in-a-group), or a [self-hosted runner](#choosing-self-hosted-runners).{% else %} -* The destination machine can be a [self-hosted runner](#choosing-self-hosted-runners).{% endif %} +* The destination machine can be {% ifversion fpt or ghec %}either a [{% data variables.product.prodname_dotcom %}-hosted runner](#choosing-github-hosted-runners), [{% data variables.actions.hosted_runner %}](#choosing-runners-in-a-group), or a [self-hosted runner](#choosing-self-hosted-runners){% else %}a [self-hosted runner](#choosing-self-hosted-runners){% endif %}. * You can target runners based on the labels assigned to them, or their group membership, or a combination of these. * You can provide `runs-on` as: * A single string diff --git a/eslint.config.ts b/eslint.config.ts index 1517c433e14d..cdfcb54a3731 100644 --- a/eslint.config.ts +++ b/eslint.config.ts @@ -180,13 +180,11 @@ export default [ 'src/dev-toc/**/*.{ts,js}', 'src/events/components/**/*.{ts,js}', 'src/fixtures/**/*.{ts,js}', - 'src/github-apps/**/*.{ts,js}', 'src/journeys/**/*.{ts,js}', 'src/languages/**/*.{ts,js}', 'src/links/**/*.{ts,js}', 'src/metrics/**/*.{ts,js}', 'src/observability/lib/handle-package-not-found.ts', - 'src/rest/**/*.{ts,js}', 'src/search/**/*.{ts,js}', 'src/shielding/**/*.{ts,js}', ], @@ -203,6 +201,8 @@ export default [ 'src/workflows/**/*.{ts,js}', 'src/content-linter/**/*.{ts,js}', '**/*.{tsx,jsx}', + // CLI help script — chalk-colored terminal output, not application logging + 'src/rest/docs.ts', ], rules: { 'custom-rules/use-custom-logger': 'off', diff --git a/src/github-apps/lib/index.ts b/src/github-apps/lib/index.ts index a2b4f8ea0f00..7cdf5a524fe0 100644 --- a/src/github-apps/lib/index.ts +++ b/src/github-apps/lib/index.ts @@ -3,6 +3,7 @@ import fs from 'fs' import type { GetServerSidePropsContext } from 'next' import { readCompressedJsonFileFallback } from '@/frame/lib/read-json-file' +import { createLogger } from '@/observability/logger' import { getOpenApiVersion } from '@/versions/lib/all-versions' import { categoriesWithoutSubcategories } from '../../rest/lib/index' import type { Context, ExtendedRequest } from '@/types' @@ -15,7 +16,7 @@ interface AppsConfig { // are expected to provide the concrete shape via the generic parameter. type AppsData = Record -const DEBUG = process.env.RUNNER_DEBUG === '1' || process.env.DEBUG === '1' +const logger = createLogger(import.meta.url) const ENABLED_APPS_DIR = 'src/github-apps/data' const githubAppsData = new Map>() @@ -33,11 +34,7 @@ export async function getAppsData( docsVersion: string, apiVersion?: string, ): Promise { - if (DEBUG) { - console.log( - `[DEBUG] getAppsData: ROOT=${process.env.ROOT || '(not set)'}, path=${ENABLED_APPS_DIR}`, - ) - } + logger.debug('getAppsData', { root: process.env.ROOT || '(not set)', path: ENABLED_APPS_DIR }) const pageTypeMap = githubAppsData.get(pageType)! const filename = `${pageType}.json` diff --git a/src/journeys/components/JourneyTrackCard.tsx b/src/journeys/components/JourneyTrackCard.tsx index 7eda7b69e682..01183b2e3934 100644 --- a/src/journeys/components/JourneyTrackCard.tsx +++ b/src/journeys/components/JourneyTrackCard.tsx @@ -27,7 +27,7 @@ export function JourneyTrackCard({ journey }: Props) { {trackTitle} - + {t('current_progress') .replace('{n}', `${numberOfGuides}`) .replace('{i}', `${currentGuideIndex + 1}`)}