Skip to content

Commit aea537c

Browse files
authored
Merge pull request github#36570 from github/repo-sync
Repo sync
2 parents 08e8e07 + bf209e9 commit aea537c

File tree

12 files changed

+26
-19
lines changed

12 files changed

+26
-19
lines changed

.github/workflows/test.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ jobs:
6666
# - links
6767
- observability
6868
# - open-source
69-
- pageinfo
7069
# - pages
7170
- products
7271
- redirects
@@ -176,7 +175,7 @@ jobs:
176175

177176
- uses: ./.github/actions/precompute-pageinfo
178177
# Only the 'pageinfo' tests include end-to-end tests about this.
179-
if: ${{ matrix.name == 'pageinfo' }}
178+
if: ${{ matrix.name == 'article-api' }}
180179
env:
181180
ROOT: src/fixtures/fixtures
182181

@@ -194,6 +193,6 @@ jobs:
194193
# tests run only in English. The exception is the
195194
# `languages` suite which needs all languages to be set up.
196195
ENABLED_LANGUAGES: ${{ matrix.name == 'languages' && 'all' || '' }}
197-
ROOT: ${{ (matrix.name == 'fixtures' || matrix.name == 'pageinfo' || matrix.name == 'landings' ) && 'src/fixtures/fixtures' || '' }}
198-
TRANSLATIONS_FIXTURE_ROOT: ${{ (matrix.name == 'fixtures' || matrix.name == 'pageinfo') && 'src/fixtures/fixtures/translations' || '' }}
196+
ROOT: ${{ (matrix.name == 'fixtures' || matrix.name == 'article-api' || matrix.name == 'landings' ) && 'src/fixtures/fixtures' || '' }}
197+
TRANSLATIONS_FIXTURE_ROOT: ${{ (matrix.name == 'fixtures' || matrix.name == 'article-api') && 'src/fixtures/fixtures/translations' || '' }}
199198
run: npm test -- src/${{ matrix.name }}/tests/

content/get-started/learning-to-code/learning-to-debug-with-github-copilot.md

+8
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,14 @@ Why is the output of this code so much higher than expected? Please explain in d
143143
144144
To fix this error, {% data variables.product.prodname_copilot_short %} will suggest code that removes the extra `factorial` from the equation, or that changes the `*=` operator to `=`.
145145
146+
{% note %}
147+
148+
Did you successfully debug `bugged_factorial_finder.py`?
149+
150+
<a href="https://docs.github.io/success-test/yes.html" target="_blank" class="btn btn-outline mt-3 mr-3 no-underline"><span>Yes</span></a> <a href="https://docs.github.io/success-test/no.html" target="_blank" class="btn btn-outline mt-3 mr-3 no-underline"><span>No</span></a>
151+
152+
{% endnote %}
153+
146154
## Debugging your own project
147155
148156
Now that you've practiced debugging some simple programs with {% data variables.product.prodname_copilot_short %}, you can use the same methodologies to find and fix bugs hiding in your own work.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"playwright-test": "playwright test --config src/fixtures/playwright.config.ts --project=\"Google Chrome\"",
6565
"post-lints": "tsx src/content-linter/scripts/post-lints.js",
6666
"postinstall": "cp package-lock.json .installed.package-lock.json && echo \"Updated .installed.package-lock.json\" # see husky/post-checkout and husky/post-merge",
67-
"precompute-pageinfo": "tsx src/pageinfo/scripts/precompute-pageinfo.ts",
67+
"precompute-pageinfo": "tsx src/article-api/scripts/precompute-pageinfo.ts",
6868
"prepare": "husky src/workflows/husky",
6969
"prettier": "prettier -w \"**/*.{ts,tsx,js,mjs,scss,yml,yaml}\"",
7070
"prettier-check": "prettier -c \"**/*.{ts,tsx,js,mjs,scss,yml,yaml}\"",
File renamed without changes.
File renamed without changes.

src/pageinfo/scripts/precompute-pageinfo.ts src/article-api/scripts/precompute-pageinfo.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import { program, Option } from 'commander'
3434

3535
import { languageKeys } from 'src/languages/lib/languages.js'
3636
import { loadPages, loadUnversionedTree } from 'src/frame/lib/page-data.js'
37-
import { CACHE_FILE_PATH, getPageInfo } from '../middleware'
37+
import { CACHE_FILE_PATH, getPageInfo } from '../middleware/pageinfo'
3838

3939
program
4040
.description('Generates a JSON file with precompute pageinfo data by pathname')
File renamed without changes.

src/frame/middleware/api.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import events from '@/events/middleware.js'
55
import anchorRedirect from '@/rest/api/anchor-redirect.js'
66
import aiSearch from '@/search/middleware/ai-search'
77
import search from '@/search/middleware/search-routes.js'
8-
import pageInfo from '@/pageinfo/middleware'
8+
import pageInfo from '#src/article-api/middleware/pageinfo.ts'
99
import pageList from '@/article-api/middleware/pagelist'
1010
import webhooks from '@/webhooks/middleware/webhooks.js'
1111
import { ExtendedRequest } from '@/types'

src/graphql/data/fpt/schema.docs.graphql

+4-4
Original file line numberDiff line numberDiff line change
@@ -38632,8 +38632,8 @@ Require all commits be made to a non-target branch and submitted via a pull requ
3863238632
"""
3863338633
type PullRequestParameters {
3863438634
"""
38635-
When merging pull requests, you can allow any combination of merge commits,
38636-
squashing, or rebasing. At least one option must be enabled.
38635+
Array of allowed merge methods. Allowed values include `merge`, `squash`, and
38636+
`rebase`. At least one option must be enabled.
3863738637
"""
3863838638
allowedMergeMethods: [String!]
3863938639

@@ -38668,8 +38668,8 @@ Require all commits be made to a non-target branch and submitted via a pull requ
3866838668
"""
3866938669
input PullRequestParametersInput {
3867038670
"""
38671-
When merging pull requests, you can allow any combination of merge commits,
38672-
squashing, or rebasing. At least one option must be enabled.
38671+
Array of allowed merge methods. Allowed values include `merge`, `squash`, and
38672+
`rebase`. At least one option must be enabled.
3867338673
"""
3867438674
allowedMergeMethods: [String!]
3867538675

src/graphql/data/fpt/schema.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -53134,7 +53134,7 @@
5313453134
"fields": [
5313553135
{
5313653136
"name": "allowedMergeMethods",
53137-
"description": "<p>When merging pull requests, you can allow any combination of merge commits,\nsquashing, or rebasing. At least one option must be enabled.</p>",
53137+
"description": "<p>Array of allowed merge methods. Allowed values include <code>merge</code>, <code>squash</code>, and\n<code>rebase</code>. At least one option must be enabled.</p>",
5313853138
"type": "[String!]",
5313953139
"id": "string",
5314053140
"kind": "scalars",
@@ -101096,7 +101096,7 @@
101096101096
"inputFields": [
101097101097
{
101098101098
"name": "allowedMergeMethods",
101099-
"description": "<p>When merging pull requests, you can allow any combination of merge commits,\nsquashing, or rebasing. At least one option must be enabled.</p>",
101099+
"description": "<p>Array of allowed merge methods. Allowed values include <code>merge</code>, <code>squash</code>, and\n<code>rebase</code>. At least one option must be enabled.</p>",
101100101100
"type": "[String!]",
101101101101
"id": "string",
101102101102
"kind": "scalars",

src/graphql/data/ghec/schema.docs.graphql

+4-4
Original file line numberDiff line numberDiff line change
@@ -38632,8 +38632,8 @@ Require all commits be made to a non-target branch and submitted via a pull requ
3863238632
"""
3863338633
type PullRequestParameters {
3863438634
"""
38635-
When merging pull requests, you can allow any combination of merge commits,
38636-
squashing, or rebasing. At least one option must be enabled.
38635+
Array of allowed merge methods. Allowed values include `merge`, `squash`, and
38636+
`rebase`. At least one option must be enabled.
3863738637
"""
3863838638
allowedMergeMethods: [String!]
3863938639

@@ -38668,8 +38668,8 @@ Require all commits be made to a non-target branch and submitted via a pull requ
3866838668
"""
3866938669
input PullRequestParametersInput {
3867038670
"""
38671-
When merging pull requests, you can allow any combination of merge commits,
38672-
squashing, or rebasing. At least one option must be enabled.
38671+
Array of allowed merge methods. Allowed values include `merge`, `squash`, and
38672+
`rebase`. At least one option must be enabled.
3867338673
"""
3867438674
allowedMergeMethods: [String!]
3867538675

src/graphql/data/ghec/schema.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -53134,7 +53134,7 @@
5313453134
"fields": [
5313553135
{
5313653136
"name": "allowedMergeMethods",
53137-
"description": "<p>When merging pull requests, you can allow any combination of merge commits,\nsquashing, or rebasing. At least one option must be enabled.</p>",
53137+
"description": "<p>Array of allowed merge methods. Allowed values include <code>merge</code>, <code>squash</code>, and\n<code>rebase</code>. At least one option must be enabled.</p>",
5313853138
"type": "[String!]",
5313953139
"id": "string",
5314053140
"kind": "scalars",
@@ -101096,7 +101096,7 @@
101096101096
"inputFields": [
101097101097
{
101098101098
"name": "allowedMergeMethods",
101099-
"description": "<p>When merging pull requests, you can allow any combination of merge commits,\nsquashing, or rebasing. At least one option must be enabled.</p>",
101099+
"description": "<p>Array of allowed merge methods. Allowed values include <code>merge</code>, <code>squash</code>, and\n<code>rebase</code>. At least one option must be enabled.</p>",
101100101100
"type": "[String!]",
101101101101
"id": "string",
101102101102
"kind": "scalars",

0 commit comments

Comments
 (0)