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 #35277

Merged
merged 7 commits into from
Nov 13, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/orphaned-files-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
# The `-s` is to make npm run silent and not print verbose
# information about the npm script alias.
assetFilesToRemove=$(npm run -s find-orphaned-assets)
reusableFilesToRemove=$(npm run -s reusables -- find unused | grep '^data/reusables')
reusableFilesToRemove=$(npm run -s reusables -- find unused | grep '^data/reusables' || true)
[ -z "$assetFilesToRemove" ] && [ -z "$reusableFilesToRemove" ] && exit 0

if [ -n "$assetFilesToRemove" ]; then
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ You can sign commits and tags locally, to give other people confidence about the
If a commit or tag has a signature that can't be verified, {% data variables.product.product_name %} marks the commit or tag "Unverified."
{% endif %}

For most individual users, GPG or SSH will be the best choice for signing commits. S/MIME signatures are usually required in the context of a larger organization. SSH signatures are the simplest to generate. You can even upload your existing authentication key to {% data variables.product.product_name %} to also use as a signing key. Generating a GPG signing key is more involved than generating an SSH key, but GPG has features that SSH does not. A GPG key can expire or be revoked when no longer used. {% data variables.product.product_name %} shows commits that were signed with such a key as "Verified" unless the key was marked as compromised. SSH keys don't have this capability.
For most individual users, GPG or SSH will be the best choice for signing commits. S/MIME signatures are usually required in the context of a larger organization. SSH signatures are the simplest to generate. You can even upload your existing authentication key to {% data variables.product.product_name %} to also use as a signing key. Generating a GPG signing key is more involved than generating an SSH key, but GPG has features that SSH does not. A GPG key can expire or be revoked when no longer used. The GPG signature may include the information about it being expired or revoked.

{% ifversion fpt or ghec %}

Commits and tags have the following verification statuses, depending on whether you have enabled vigilant mode. By default vigilant mode is not enabled. For information on how to enable vigilant mode, see "[AUTOTITLE](/authentication/managing-commit-signature-verification/displaying-verification-statuses-for-all-of-your-commits)."

Signing commits differs from signing off on a commit. For more information about signing off on commits, see "[AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-the-commit-signoff-policy-for-your-repository)."
Expand All @@ -41,6 +42,24 @@ Signing commits differs from signing off on a commit. For more information about
| **Unverified** | The commit is signed but the signature could not be verified.
| No verification status | The commit is not signed.

### Persistent commit signature verification

Regardless of the signature choice - GPG, SSH, or S/MIME - once a commit signature is verified, it remains verified within its repository's network. See "[AUTOTITLE](/repositories/viewing-activity-and-data-for-your-repository/understanding-connections-between-repositories)."

When a commit signature is verified upon being pushed to {% data variables.product.product_name %}, a verification record is stored alongside the commit. This record can't be edited and will persist so that signatures remain verified over time, even if signing keys are rotated, revoked, or if contributors leave the organization.

The verification record includes a timestamp marking when the verification was completed. This persistent record ensures a consistent verified state, providing a stable history of contributions within the repository. You can view this timestamp by hovering over the "Verified" badge on {% data variables.product.product_name %} or by accessing the commit via the REST API, which includes a `verified_at` field. See "[AUTOTITLE](/rest/commits/commits)."

Persistent commit signature verification applies to new commits pushed to {% data variables.product.product_name %}. For any commits that predate this feature, a persistent record will be created the next time the commit's signature is verified on {% data variables.product.product_name %}, helping ensure that verified statuses remain stable and reliable across the repository's history.

#### Records persist even after revocation and expiration

Persistent commit signature verification reflects the verified state of a commit at the time of verification. This means that if a signing key is later revoked, expired, or otherwise altered, previously verified commits retain their verified status based on the record created during the initial verification. {% data variables.product.product_name %} will not re-verify previously signed commits or retroactively adjust their verification status in response to changes in the key's state. Organizations may need to manage key states directly to align with their security policies, especially if frequent key rotation or revocation is planned.

#### The verification record is scoped to its repository network

The verification record is persistent across the repository network, meaning that if the same commit is pushed again to the same repository or to any of its forks, the existing verification record is reused. This allows {% data variables.product.product_name %} to maintain a consistent verified status across related repositories without re-verifying the commit each time it appears within the network. This persistence reinforces a unified and reliable view of commit authenticity across all instances of the commit within the repository network.

{% endif %}

### Signature verification for rebase and merge
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,8 @@ topics:
shortTitle: About Git LFS billing
---

{% ifversion enhanced-billing-platform %}

{% data reusables.billing.enhanced-billing-platform %}

{% endif %}

## About billing for {% data variables.large_files.product_name_long %}

{% data reusables.large_files.free-storage-bandwidth-amount %} {% data reusables.large_files.does_not_carry %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,8 @@ topics:
shortTitle: Downgrade Git LFS storage
---

{% ifversion enhanced-billing-platform %}

{% data reusables.billing.enhanced-billing-platform %}

{% endif %}

When you downgrade your number of data packs, your change takes effect on your next billing date. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage)."

## Downgrading storage and bandwidth for a personal account
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,4 @@ children:
- /downgrading-git-large-file-storage
---

{% ifversion enhanced-billing-platform %}

{% data reusables.billing.enhanced-billing-platform %}

{% endif %}
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,8 @@ topics:
shortTitle: Upgrade Git LFS storage
---

{% ifversion enhanced-billing-platform %}

{% data reusables.billing.enhanced-billing-platform %}

{% endif %}

## Purchasing additional storage and bandwidth for a personal account

{% data reusables.user-settings.access_settings %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,8 @@ topics:
shortTitle: View Git LFS usage
---

{% ifversion enhanced-billing-platform %}

{% data reusables.billing.enhanced-billing-platform %}

{% endif %}

{% data reusables.large_files.owner_quota_only %} {% data reusables.large_files.does_not_carry %}

## Viewing storage and bandwidth usage for a personal account
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,8 @@ topics:
shortTitle: Billing for GitHub Actions
---

{% ifversion enhanced-billing-platform %}

{% data reusables.billing.enhanced-billing-platform %}

{% endif %}

## About billing for {% data variables.product.prodname_actions %}

{% ifversion billing-auth-and-capture %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,4 @@ children:
- /managing-your-spending-limit-for-github-actions
---

{% ifversion enhanced-billing-platform %}

{% data reusables.billing.enhanced-billing-platform %}

{% endif %}
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,8 @@ topics:
shortTitle: Spending limits for Actions
---

{% ifversion enhanced-billing-platform %}

{% data reusables.billing.enhanced-billing-platform %}

{% endif %}

## About spending limits for {% data variables.product.prodname_actions %}

{% data reusables.actions.actions-billing %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,8 @@ topics:
shortTitle: View your Actions usage
---

{% ifversion enhanced-billing-platform %}

{% data reusables.billing.enhanced-billing-platform %}

{% endif %}

You can also view the billable job execution minutes for an individual workflow run. For more information, see "[AUTOTITLE](/actions/monitoring-and-troubleshooting-workflows/viewing-job-execution-time)."

## Viewing {% data variables.product.prodname_actions %} usage for your personal account
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,8 @@ redirect_from:
- /billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces
---

{% ifversion enhanced-billing-platform %}

{% data reusables.billing.enhanced-billing-platform %}

{% endif %}

## About {% data variables.product.prodname_github_codespaces %} pricing

{% ifversion billing-auth-and-capture %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,4 @@ children:
- /managing-the-spending-limit-for-github-codespaces
---

{% ifversion enhanced-billing-platform %}

{% data reusables.billing.enhanced-billing-platform %}

{% endif %}
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,8 @@ redirect_from:
- /billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces
---

{% ifversion enhanced-billing-platform %}

{% data reusables.billing.enhanced-billing-platform %}

{% endif %}

## About the {% data variables.product.prodname_github_codespaces %} spending limit

{% data reusables.codespaces.codespaces-free-for-personal-intro %} See "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,8 @@ redirect_from:
- /billing/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage
---

{% ifversion enhanced-billing-platform %}

{% data reusables.billing.enhanced-billing-platform %}

{% endif %}

## Viewing {% data variables.product.prodname_github_codespaces %} usage for your personal account

You can see how much of the usage included in your personal account you have used so far in the current monthly billing cycle. If you have set up a payment method, set a spending limit, and used all of your included usage, you can also check your bill for the current month.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,4 @@ children:
- /about-billing-for-github-copilot
---

{% ifversion enhanced-billing-platform %}

{% data reusables.billing.enhanced-billing-platform %}

{% endif %}
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,8 @@ topics:
shortTitle: About billing
---

{% ifversion enhanced-billing-platform %}

{% data reusables.billing.enhanced-billing-platform %}

{% endif %}

## About billing for {% data variables.product.prodname_registry %}

{% ifversion billing-auth-and-capture %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,4 @@ children:
- /managing-your-spending-limit-for-github-packages
---

{% ifversion enhanced-billing-platform %}

{% data reusables.billing.enhanced-billing-platform %}

{% endif %}
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,8 @@ topics:
shortTitle: Your spending limit
---

{% ifversion enhanced-billing-platform %}

{% data reusables.billing.enhanced-billing-platform %}

{% endif %}

## About spending limits for {% data variables.product.prodname_registry %}

{% data reusables.package_registry.packages-billing %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,8 @@ topics:
shortTitle: View your usage
---

{% ifversion enhanced-billing-platform %}

{% data reusables.billing.enhanced-billing-platform %}

{% endif %}

## Viewing {% data variables.product.prodname_registry %} usage for your personal account

Anyone can view {% data variables.product.prodname_registry %} usage for their own personal account.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Administrators for your enterprise account on {% data variables.product.prodname

You have access to the new billing platform if you have an enterprise account, or if you are part of an organization owned by an enterprise account, created after June 2, 2024. Enterprises that participated in the {% data variables.release-phases.private_preview %} also have access to the new billing platform. See "[AUTOTITLE](/billing/using-the-new-billing-platform/about-the-new-billing-platform-for-enterprises)."

{% data reusables.billing.new-billing-platform-permissions %}
{% data reusables.billing.enhanced-billing-platform-product %}

To check if you have access:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: About billing for Git Large File Storage
intro: 'Learn about billing for {% data variables.large_files.product_name_long %}.'
intro: 'Learn about billing for {% data variables.large_files.product_name_long %} using the enhanced billing platform.'
versions:
feature: enhanced-billing-platform
redirect_from:
Expand All @@ -10,8 +10,9 @@ topics:
- Billing
- LFS
- Enterprise
- Team
shortTitle: About Git LFS billing
permissions: '{% data reusables.billing.new-billing-platform-permissions %}'
product: '{% data reusables.billing.enhanced-billing-platform-product %}'
---

## About billing for {% data variables.large_files.product_name_long %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,16 @@ redirect_from:
type: overview
topics:
- Enterprise
permissions: '{% data reusables.billing.new-billing-platform-permissions %}'
- Team
product: '{% data reusables.billing.enhanced-billing-platform-product %}'
---

>[!IMPORTANT] If you are on not on the new billing platform, this article does not apply to you. To check if you are on the new billing platform, see "[How do I know if I can access the enhanced billing platform?](/billing/using-the-new-billing-platform/about-the-new-billing-platform-for-enterprises#how-do-i-know-if-i-can-access-the-enhanced-billing-platform)." For more information about the billing cycle for your enterprise account, see "[AUTOTITLE](/billing/using-the-billing-platform/changing-the-duration-of-your-billing-cycle#changing-the-duration-of-your-enterprise-accounts-billing-cycle)."
>[!IMPORTANT] {% ifversion fpt %}If you have a {% data variables.product.prodname_free_user %} plan or a {% data variables.product.prodname_pro %} plan, this article does not apply to you.{% elsif ghec %}If you have not migrated to the enhanced billing platform, this article does not apply to you.{% endif %}
>
> To check if you are on the enhanced billing platform, see "[How do I know if I can access the enhanced billing platform?](/billing/using-the-new-billing-platform/about-the-new-billing-platform-for-enterprises#how-do-i-know-if-i-can-access-the-enhanced-billing-platform)."

If your enterprise is on the new billing platform, you have a fixed billing period for metered usage which runs from the first day of the month to the last day of the month. When the month ends, the usage is scheduled to be billed on your bill cycle day. Your bill cycle day is dictated by the moment you converted from a trial to a paid enterprise account. For example, if you converted on the fifteenth of the month, you will be billed on the fifteenth of each subsequent month.
If your {% data variables.enterprise.enterprise_or_org %} uses the enhanced billing platform, you have a fixed billing period for metered usage which runs from the first day of the month to the last day of the month. When the month ends, the usage is scheduled to be billed on your bill cycle day. Your bill cycle day {% ifversion fpt %}is the day you created your organization. For example, if you created the account{% elsif ghec %}is dictated by the moment you converted from a trial to a paid enterprise account. For example, if you converted{% endif %} on the fifteenth of the month, you will be billed on the fifteenth of each subsequent month.

This applies to all products available through the new billing platform.
This applies to all products available through the enhanced billing platform.

If still use the previous billing platform, for more information about the billing cycle for your account, see "[AUTOTITLE](/billing/using-the-billing-platform/changing-the-duration-of-your-billing-cycle)."
Original file line number Diff line number Diff line change
@@ -1,22 +1,36 @@
---
title: About the new billing platform for enterprises
title: About the new billing platform
intro: Learn about the billing platform's key functionalities, and how it can help you manage your spending more effectively.
versions:
feature: enhanced-billing-platform
redirect_from:
- /billing/using-the-enhanced-billing-platform-for-enterprises/about-the-enhanced-billing-platform-for-enterprises
- /billing/using-the-new-billing-platform/about-the-new-billing-platform-for-enterprises
type: overview
topics:
- Enterprise
permissions: '{% data reusables.billing.new-billing-platform-permissions %}'
- Team
product: '{% data reusables.billing.enhanced-billing-platform-product %}'
shortTitle: About the new billing platform
---

The new billing platform provides better spending control and detailed usage insights with granular controls.
The enhanced billing platform provides better spending control and detailed usage insights with granular controls.

## Available products

The following products are available in the new billing platform:
The products shown in the enhanced billing platform are determined by your {% data variables.product.github %} plan and subscriptions.

### {% data variables.product.prodname_team %}

* {% data variables.product.prodname_actions %}
* {% data variables.product.prodname_github_codespaces %}
* {% data variables.product.prodname_copilot %}
* {% data variables.product.prodname_registry %}
* {% data variables.large_files.product_name_long %}

{% ifversion ghec %}

### {% data variables.product.prodname_ghe_cloud %}

* {% data variables.product.prodname_actions %}
* {% data variables.product.prodname_GH_advanced_security %} (only available with a trial of {% data variables.product.prodname_ghe_cloud %})
Expand All @@ -32,25 +46,38 @@ The following products are available in the new billing platform:

{% endif %}

{% endif %}

## Key functionalities

With the new billing platform, you can:

* **Estimate spending:** Understand where your (annual, monthly, etc.) spending is trending based on the usage across costs centers and budgets.
* **Estimate spending:** Understand where your (annual, monthly, etc.) spending is trending based on the usage across {% ifversion ghec %}cost centers and {% endif %}budgets.
* **Gather insights and data:** Generate usage reports to share with your team or stakeholders, and know if you're on track with your budget.
{%- ifversion ghec %}
* **Charge business units:** Improve accountability by creating and assigning organizations, repositories, and members to cost centers.
{%- endif %}
* **Prevent overspending:** Use budgets and alerts to track and control your spending.
* **Observe and understand spending:** Understand how your spending changes over time and across which products.

## How do I know if I can access the new billing platform?

{% data reusables.billing.new-billing-platform-permissions %}
{% data reusables.billing.enhanced-billing-platform-product %}

{% data reusables.permissions.enhanced-billing-platform %} can check for access to the enhanced platform:

To check if you have access:
{% ifversion fpt %}

{% data reusables.profile.access_org %}
{% data reusables.profile.org_settings %}

{% elsif ghec %}

{% data reusables.enterprise-accounts.access-enterprise %}

If you have access, there will be a {% octicon "credit-card" aria-hidden="true" %} **Billing & Licensing** option in the enterprise account sidebar.
{% endif %}

If you have access, there will be a {% octicon "credit-card" aria-hidden="true" %} **Billing & Licensing** option in the sidebar. If you do **not** have access to the new, enhanced billing platform, to find out more about your billing platform, see "[AUTOTITLE](/billing/using-the-billing-platform/about-billing-on-github)."

## Next steps

Expand Down
Loading
Loading