Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Repo sync #35898

Merged
merged 5 commits into from
Jan 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/sync-codeql-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,3 +109,9 @@ jobs:
If CI does not pass or other problems arise, contact #docs-engineering on slack.' \
--repo github/docs-internal \
--label "codeql-cli-pipeline,skip FR board,ready-for-doc-review"

- uses: ./.github/actions/slack-alert
if: ${{ failure() && github.event_name != 'workflow_dispatch' }}
with:
slack_channel_id: ${{ secrets.DOCS_ALERTS_SLACK_CHANNEL_ID }}
slack_token: ${{ secrets.SLACK_DOCS_BOT_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/sync-graphql.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Update GraphQL files
name: Sync GraphQL schema

# **What it does**: This updates our GraphQL schemas.
# **Why we have it**: We want our GraphQL docs up to date.
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/sync-openapi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@ jobs:

If CI does not pass or other problems arise, contact #docs-engineering on slack.' \
--repo github/docs-internal \
--label github-openapi-bot
--label github-openapi-bot \
--head=$branchname \

- uses: ./.github/actions/slack-alert
if: ${{ failure() && github.event_name != 'workflow_dispatch' }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ There are a few key differences between metered and volume billing for {% data v

* **Volume billing:**

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

### Managing committers and repositories

{% 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).
{% 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).

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 %}.

Expand Down
2 changes: 1 addition & 1 deletion data/reusables/actions/ref-description.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
The fully-formed ref of the branch or tag that triggered the workflow run. For workflows triggered by `push`, this is the branch or tag ref that was pushed. For workflows triggered by `pull_request`, this is the pull request merge branch. For workflows triggered by `release`, this is the release tag created. For other triggers, this is the branch or tag ref that triggered the workflow run. This is only set if a branch or tag is available for the event type. The ref given is fully-formed, meaning that for branches the format is `refs/heads/<branch_name>`, for pull requests it is `refs/pull/<pr_number>/merge`, and for tags it is `refs/tags/<tag_name>`. For example, `refs/heads/feature-branch-1`.
The fully-formed ref of the branch or tag that triggered the workflow run. For workflows triggered by `push`, this is the branch or tag ref that was pushed. For workflows triggered by `pull_request`, this is the pull request merge branch. For workflows triggered by `release`, this is the release tag created. For other triggers, this is the branch or tag ref that triggered the workflow run. This is only set if a branch or tag is available for the event type. The ref given is fully-formed, meaning that for branches the format is `refs/heads/<branch_name>`. For pull requests events `except pull_request_target`, it is `refs/pull/<pr_number>/merge`. `pull_request_target` events have the `ref` from the base branch. For tags it is `refs/tags/<tag_name>`. For example, `refs/heads/feature-branch-1`.
2 changes: 1 addition & 1 deletion src/secret-scanning/data/public-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1878,7 +1878,7 @@
hasValidityCheck: false
isduplicate: false
- provider: Hubspot
supportedSecret: 'Hubspot Private Apps User Token '
supportedSecret: Hubspot Private Apps User Token
secretType: hubspot_private_apps_user_token
versions:
fpt: '*'
Expand Down
4 changes: 2 additions & 2 deletions src/secret-scanning/lib/config.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sha": "bfdf16111828f166642727f533b60d4d0e054d90",
"blob-sha": "633381a5c2da040948606c15f58ec7c977047c5b",
"sha": "cbe3e18d7f44192a2834d7fa44ff85bd1427050d",
"blob-sha": "8dd5008bd4587fef156083689b4063392949d52c",
"targetFilename": "code-security/secret-scanning/introduction/supported-secret-scanning-patterns"
}
15 changes: 4 additions & 11 deletions src/workflows/close-dangling-prs.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { program, Option } from 'commander'

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

const DRY_RUN = process.env.DRY_RUN || 'false'
Expand Down Expand Up @@ -32,19 +31,13 @@ const CONFIGS: Config[] = [
},
]

let owner = 'github'
let repo = 'docs-internal'

if (process.env.GITHUB_EVENT_PATH) {
const actionContext = getActionContext()
owner = actionContext.owner
repo = actionContext.repo
}
const owner = process.env.GITHUB_REPOSITORY_OWNER || 'github'
const repo = process.env.GITHUB_REPOSITORY?.split('/')[1] || 'docs-internal'

program
.description('Finds PRs with "FOR PREVIEW ONLY" in the title that are too old and closes them.')
.option('owner', 'Owner of the repository', owner)
.option('repo', 'Name of the repository', repo)
.option('--owner', 'Owner of the repository', owner)
.option('--repo', 'Name of the repository', repo)
.addOption(
new Option(
'--dry-run',
Expand Down
Loading