Skip to content

Commit 1aa50eb

Browse files
authored
Merge pull request #35898 from github/repo-sync
Repo sync
2 parents 0193532 + 4affc52 commit 1aa50eb

File tree

7 files changed

+18
-18
lines changed

7 files changed

+18
-18
lines changed

.github/workflows/sync-codeql-cli.yml

+6
Original file line numberDiff line numberDiff line change
@@ -109,3 +109,9 @@ jobs:
109109
If CI does not pass or other problems arise, contact #docs-engineering on slack.' \
110110
--repo github/docs-internal \
111111
--label "codeql-cli-pipeline,skip FR board,ready-for-doc-review"
112+
113+
- uses: ./.github/actions/slack-alert
114+
if: ${{ failure() && github.event_name != 'workflow_dispatch' }}
115+
with:
116+
slack_channel_id: ${{ secrets.DOCS_ALERTS_SLACK_CHANNEL_ID }}
117+
slack_token: ${{ secrets.SLACK_DOCS_BOT_TOKEN }}

.github/workflows/sync-graphql.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Update GraphQL files
1+
name: Sync GraphQL schema
22

33
# **What it does**: This updates our GraphQL schemas.
44
# **Why we have it**: We want our GraphQL docs up to date.

.github/workflows/sync-openapi.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ jobs:
101101
102102
If CI does not pass or other problems arise, contact #docs-engineering on slack.' \
103103
--repo github/docs-internal \
104-
--label github-openapi-bot
104+
--label github-openapi-bot \
105+
--head=$branchname \
105106
106107
- uses: ./.github/actions/slack-alert
107108
if: ${{ failure() && github.event_name != 'workflow_dispatch' }}

content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ There are a few key differences between metered and volume billing for {% data v
3838

3939
* **Volume billing:**
4040

41-
* Purchase a defined number of licenses (e.g. 100 licenses).
41+
* Purchase a defined number of licenses (for example, 100 licenses).
4242
* If usage exceeds purchased licenses, you will need to purchase additional licenses to cover this overage usage.
4343

4444
### Managing committers and repositories
4545

46-
{% data variables.product.prodname_GH_advanced_security %} is billed per committer and enabled by repository. If a committer is removed from an organization or enterprise, they are no longer billable as of the removal day. However, if you disable {% data variables.product.prodname_GH_advanced_security %} on a repository, the committers tied to that repository will remain billable until the end of the current monthly billing cycle. Prorated billing applies if a committer starts partway through the month. For an example of how this works, see [Understanding usage](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security#understanding-usage).
46+
{% data variables.product.prodname_GH_advanced_security %} is billed per committer and enabled by repository. If you remove a committer from an organization or enterprise, or if you disable {% data variables.product.prodname_GH_advanced_security %} on a repository, the committers will remain billable until the end of the current monthly billing cycle. Prorated billing applies only when a committer starts partway through the month. For examples of how committers are tracked and billed, see [Understanding usage](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security#understanding-usage).
4747

4848
If you have further questions about using {% data variables.product.prodname_GH_advanced_security %}, you can contact your account manager in {% data variables.contact.contact_enterprise_sales %}.
4949

src/secret-scanning/data/public-docs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1878,7 +1878,7 @@
18781878
hasValidityCheck: false
18791879
isduplicate: false
18801880
- provider: Hubspot
1881-
supportedSecret: 'Hubspot Private Apps User Token '
1881+
supportedSecret: Hubspot Private Apps User Token
18821882
secretType: hubspot_private_apps_user_token
18831883
versions:
18841884
fpt: '*'

src/secret-scanning/lib/config.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"sha": "bfdf16111828f166642727f533b60d4d0e054d90",
3-
"blob-sha": "633381a5c2da040948606c15f58ec7c977047c5b",
2+
"sha": "cbe3e18d7f44192a2834d7fa44ff85bd1427050d",
3+
"blob-sha": "8dd5008bd4587fef156083689b4063392949d52c",
44
"targetFilename": "code-security/secret-scanning/introduction/supported-secret-scanning-patterns"
55
}

src/workflows/close-dangling-prs.ts

+4-11
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { program, Option } from 'commander'
22

33
import github from './github.js'
4-
import { getActionContext } from './action-context.js'
54
import { octoSecondaryRatelimitRetry } from './secondary-ratelimit-retry'
65

76
const DRY_RUN = process.env.DRY_RUN || 'false'
@@ -32,19 +31,13 @@ const CONFIGS: Config[] = [
3231
},
3332
]
3433

35-
let owner = 'github'
36-
let repo = 'docs-internal'
37-
38-
if (process.env.GITHUB_EVENT_PATH) {
39-
const actionContext = getActionContext()
40-
owner = actionContext.owner
41-
repo = actionContext.repo
42-
}
34+
const owner = process.env.GITHUB_REPOSITORY_OWNER || 'github'
35+
const repo = process.env.GITHUB_REPOSITORY?.split('/')[1] || 'docs-internal'
4336

4437
program
4538
.description('Finds PRs with "FOR PREVIEW ONLY" in the title that are too old and closes them.')
46-
.option('owner', 'Owner of the repository', owner)
47-
.option('repo', 'Name of the repository', repo)
39+
.option('--owner', 'Owner of the repository', owner)
40+
.option('--repo', 'Name of the repository', repo)
4841
.addOption(
4942
new Option(
5043
'--dry-run',

0 commit comments

Comments
 (0)