Skip to content

Commit 1cad103

Browse files
authored
Merge pull request #44463 from github/repo-sync
Repo sync
2 parents b64c874 + 4ec9185 commit 1cad103

4 files changed

Lines changed: 7 additions & 11 deletions

File tree

data/reusables/actions/jobs/choosing-runner-overview.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
Use `jobs.<job_id>.runs-on` to define the type of machine to run the job on.
22

3-
{% 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 %}
4-
* The destination machine can be a [self-hosted runner](#choosing-self-hosted-runners).{% endif %}
3+
* 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 %}.
54
* You can target runners based on the labels assigned to them, or their group membership, or a combination of these.
65
* You can provide `runs-on` as:
76
* A single string

eslint.config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,13 +180,11 @@ export default [
180180
'src/dev-toc/**/*.{ts,js}',
181181
'src/events/components/**/*.{ts,js}',
182182
'src/fixtures/**/*.{ts,js}',
183-
'src/github-apps/**/*.{ts,js}',
184183
'src/journeys/**/*.{ts,js}',
185184
'src/languages/**/*.{ts,js}',
186185
'src/links/**/*.{ts,js}',
187186
'src/metrics/**/*.{ts,js}',
188187
'src/observability/lib/handle-package-not-found.ts',
189-
'src/rest/**/*.{ts,js}',
190188
'src/search/**/*.{ts,js}',
191189
'src/shielding/**/*.{ts,js}',
192190
],
@@ -203,6 +201,8 @@ export default [
203201
'src/workflows/**/*.{ts,js}',
204202
'src/content-linter/**/*.{ts,js}',
205203
'**/*.{tsx,jsx}',
204+
// CLI help script — chalk-colored terminal output, not application logging
205+
'src/rest/docs.ts',
206206
],
207207
rules: {
208208
'custom-rules/use-custom-logger': 'off',

src/github-apps/lib/index.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import fs from 'fs'
33
import type { GetServerSidePropsContext } from 'next'
44

55
import { readCompressedJsonFileFallback } from '@/frame/lib/read-json-file'
6+
import { createLogger } from '@/observability/logger'
67
import { getOpenApiVersion } from '@/versions/lib/all-versions'
78
import { categoriesWithoutSubcategories } from '../../rest/lib/index'
89
import type { Context, ExtendedRequest } from '@/types'
@@ -15,7 +16,7 @@ interface AppsConfig {
1516
// are expected to provide the concrete shape via the generic parameter.
1617
type AppsData = Record<string, unknown>
1718

18-
const DEBUG = process.env.RUNNER_DEBUG === '1' || process.env.DEBUG === '1'
19+
const logger = createLogger(import.meta.url)
1920
const ENABLED_APPS_DIR = 'src/github-apps/data'
2021
const githubAppsData = new Map<string, Map<string, AppsData>>()
2122

@@ -33,11 +34,7 @@ export async function getAppsData<T extends AppsData = AppsData>(
3334
docsVersion: string,
3435
apiVersion?: string,
3536
): Promise<T> {
36-
if (DEBUG) {
37-
console.log(
38-
`[DEBUG] getAppsData: ROOT=${process.env.ROOT || '(not set)'}, path=${ENABLED_APPS_DIR}`,
39-
)
40-
}
37+
logger.debug('getAppsData', { root: process.env.ROOT || '(not set)', path: ENABLED_APPS_DIR })
4138

4239
const pageTypeMap = githubAppsData.get(pageType)!
4340
const filename = `${pageType}.json`

src/journeys/components/JourneyTrackCard.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export function JourneyTrackCard({ journey }: Props) {
2727
{trackTitle}
2828
</Link>
2929
</h2>
30-
<span className="f5 color-fg-muted">
30+
<span role="status" className="f5 color-fg-muted">
3131
{t('current_progress')
3232
.replace('{n}', `${numberOfGuides}`)
3333
.replace('{i}', `${currentGuideIndex + 1}`)}

0 commit comments

Comments
 (0)