Skip to content

Commit 056f09d

Browse files
authored
Merge pull request #28816 from github/repo-sync
Repo sync
2 parents 607e8e2 + f276ec0 commit 056f09d

22 files changed

+350
-172
lines changed

content/actions/using-github-hosted-runners/connecting-to-a-private-network/configuring-azure-resources-for-private-networking-with-github-hosted-runners.md

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,16 @@ To use an Azure VNET for private networking, you must configure your Azure resou
2424

2525
## Prerequisites
2626

27-
To configure {% data variables.product.prodname_actions %} for VNET-injection, you must use an Azure account with the Subscription Contributor role and the Network Contributor role. These roles enable you to register the resource provider and delegate the subnet. For more information, see [Azure built-in roles](https://learn.microsoft.com/en-us/azure/role-based-access-control/built-in-roles) in the Azure documentation.
27+
To configure {% data variables.product.prodname_actions %} for VNET-injection, you must use an Azure account with the Subscription Contributor role and the Network Contributor role. These roles enable you to register the `GitHub.Network` resource provider and delegate the subnet. For more information, see [Azure built-in roles](https://learn.microsoft.com/en-us/azure/role-based-access-control/built-in-roles) in the Azure documentation.
2828

2929
To correctly associate the subnets with the right user, Azure `NetworkSettings` resources must be created in the same subscriptions where virtual networks are created.
3030

3131
To ensure resource availability/data residency, resources must be created in the same Azure region.
3232

3333
After you configure your Azure subscription, share your Azure Subscription ID with your {% data variables.product.company_short %} contact to enroll in the beta.
3434

35+
Obtain your enterprise `databaseId`. For more information, see "[Using GraphQL to obtain your `databaseId`](#using-graphql-to-obtain-your-databaseid)."
36+
3537
Save the following `.bicep` file in the same directory location of the script. Name the file `actions-nsg-deployment.bicep`.
3638

3739
```yaml copy
@@ -149,6 +151,24 @@ resource actions_NSG 'Microsoft.Network/networkSecurityGroups@2017-06-01' = {
149151
}
150152
```
151153

154+
## Using GraphQL to obtain your `databaseId`
155+
156+
Use the following GraphQL query to retrieve your enterprise `databaseId`. You will use the enterprise `databaseId` for the value of the `DATABASE_ID` environment variable in the next step. For more information on working with GraphQL, see "[AUTOTITLE](/graphql/guides/forming-calls-with-graphql)."
157+
158+
```graphql
159+
query(
160+
$slug: String!
161+
){
162+
enterprise (slug: $slug)
163+
{
164+
slug
165+
databaseId
166+
}
167+
}
168+
```
169+
170+
{% data reusables.enterprise_migrations.retreive-enterprise-id-graphql %}
171+
152172
## Using a script to configure your Azure resources
153173

154174
Use the following script to set up a subnet with VNET-injection in Azure. The script creates all resources in the same resource group.
@@ -210,4 +230,4 @@ echo az group delete --resource-group $RESOURCE_GROUP_NAME
210230

211231
```
212232

213-
The script will return the full payload for the created resource. The `GitHubId` hash value returned in the payload for the created resource is the network settings resource ID you will use in the next steps while configuring VNET settings with {% data variables.product.company_short %}.
233+
The script will return the full payload for the created resource. The `GitHubId` hash value returned in the payload for the created resource is the network settings resource ID you will use in the next steps while configuring VNET settings with {% data variables.product.company_short %}. For more information, see "[AUTOTITLE](/actions/using-github-hosted-runners/connecting-to-a-private-network/configuring-your-github-settings-for-use-with-azure-virtual-network)."

content/billing/managing-your-github-billing-settings/about-billing-on-github.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,6 @@ You must manage billing settings, payment method, and paid features and products
113113

114114
{% data reusables.dotcom_billing.payment-methods %} {% data reusables.dotcom_billing.same-payment-method %}
115115

116-
{% data reusables.sponsors.paypal-deprecation %}
117-
118116
{% ifversion fpt or ghec %}For qualifying usage-based services, you may choose to pay for the services from your {% data variables.product.prodname_dotcom %} account or from an Azure subscription. The terms of the billing method you choose will apply to services billed in this manner.{% endif %}
119117

120118
For more information, see "[AUTOTITLE](/billing/managing-your-github-billing-settings)."

content/sponsors/getting-started-with-github-sponsors/about-github-sponsors.md

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ topics:
1515

1616
## About {% data variables.product.prodname_sponsors %}
1717

18-
{% data reusables.sponsors.paypal-deprecation %}
19-
2018
{% data reusables.sponsors.sponsorship-details %}
2119

2220
{% data reusables.sponsors.no-fees %}
@@ -48,30 +46,43 @@ Donations between sponsored developers will not be matched.
4846
Anyone in any region can sponsor eligible maintainers, but you must reside in a supported region to receive funds.
4947

5048
<ul style="-webkit-column-count: 3; -moz-column-count: 3; column-count: 3;">
49+
<li>Albania</li>
50+
<li>Antigua & Barbuda</li>
5151
<li>Argentina</li>
52+
<li>Armenia</li>
5253
<li>Australia</li>
5354
<li>Austria</li>
55+
<li>Bahrain</li>
5456
<li>Belgium</li>
5557
<li>Bolivia</li>
58+
<li>Bosnia & Herzegovina</li>
5659
<li>Brazil</li>
5760
<li>Bulgaria</li>
61+
<li>Cambodia</li>
5862
<li>Canada</li>
5963
<li>Chile</li>
6064
<li>Colombia</li>
6165
<li>Costa Rica</li>
66+
<li>Côte d'Ivoire</li>
6267
<li>Croatia</li>
6368
<li>Cyprus</li>
6469
<li>Czech Republic</li>
6570
<li>Denmark</li>
6671
<li>Dominican Republic</li>
72+
<li>Ecuador</li>
6773
<li>Egypt</li>
74+
<li>El Salvador</li>
6875
<li>Estonia</li>
76+
<li>Ethiopia</li>
6977
<li>Finland</li>
7078
<li>France</li>
7179
<li>Gambia</li>
7280
<li>Germany</li>
81+
<li>Ghana</li>
7382
<li>Gibraltar</li>
7483
<li>Greece</li>
84+
<li>Guatemala</li>
85+
<li>Guyana</li>
7586
<li>Hong Kong SAR</li>
7687
<li>Hungary</li>
7788
<li>Iceland</li>
@@ -80,34 +91,54 @@ Anyone in any region can sponsor eligible maintainers, but you must reside in a
8091
<li>Ireland</li>
8192
<li>Israel</li>
8293
<li>Italy</li>
94+
<li>Jamaica</li>
8395
<li>Japan</li>
96+
<li>Jordan</li>
8497
<li>Kenya</li>
98+
<li>Kuwait</li>
8599
<li>Latvia</li>
86100
<li>Liechtenstein</li>
87101
<li>Lithuania</li>
88102
<li>Luxembourg</li>
103+
<li>Macao SAR</li>
104+
<li>Madagascar</li>
105+
<li>Malaysia</li>
89106
<li>Malta</li>
107+
<li>Mauritius</li>
90108
<li>Mexico</li>
109+
<li>Moldova</li>
110+
<li>Mongolia</li>
91111
<li>Morocco</li>
112+
<li>Namibia</li>
92113
<li>Netherlands</li>
93114
<li>New Zealand</li>
115+
<li>Nigeria</li>
116+
<li>North Macedonia</li>
94117
<li>Norway</li>
118+
<li>Oman</li>
119+
<li>Panama</li>
95120
<li>Paraguay</li>
96121
<li>Peru</li>
97122
<li>Philippines</li>
98123
<li>Poland</li>
99124
<li>Portugal</li>
125+
<li>Qatar</li>
100126
<li>Romania</li>
127+
<li>Rwanda</li>
101128
<li>Saudi Arabia</li>
129+
<li>Senegal</li>
102130
<li>Serbia</li>
103131
<li>Singapore</li>
104132
<li>Slovakia</li>
105133
<li>Slovenia</li>
106134
<li>South Africa</li>
107135
<li>South Korea</li>
108136
<li>Spain</li>
137+
<li>Sri Lanka</li>
138+
<li>St. Lucia</li>
109139
<li>Sweden</li>
110140
<li>Switzerland</li>
141+
<li>Tanzania</li>
111142
<li>Thailand</li>
112143
<li>Trinidad & Tobago</li>
113144
<li>Tunisia</li>
@@ -116,6 +147,8 @@ Anyone in any region can sponsor eligible maintainers, but you must reside in a
116147
<li>United Kingdom</li>
117148
<li>United States</li>
118149
<li>Uruguay</li>
150+
<li>Uzbekistan</li>
151+
<li>Vietnam</li>
119152
</ul>
120153

121154
## Sharing feedback about {% data variables.product.prodname_sponsors %}

content/sponsors/getting-started-with-github-sponsors/quickstart-for-finding-contributors-to-sponsor.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@ At https://github.com/sponsors/community, you can search by ecosystem, most used
4646

4747
## Next steps
4848

49-
For more information on starting your sponsorship, see "[AUTOTITLE](/sponsors/sponsoring-open-source-contributors/sponsoring-an-open-source-contributor)."
49+
For more information on starting your sponsorship, see "[AUTOTITLE](/sponsors/sponsoring-open-source-contributors/about-sponsorships-fees-and-taxes)" and "[AUTOTITLE](/sponsors/sponsoring-open-source-contributors/sponsoring-an-open-source-contributor-through-github)."

content/sponsors/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ featuredLinks:
2020
- /sponsors/receiving-sponsorships-through-github-sponsors/setting-up-github-sponsors-for-your-organization
2121
- /sponsors/integrating-with-github-sponsors/configuring-webhooks-for-events-in-your-sponsored-account
2222
popular:
23-
- /sponsors/sponsoring-open-source-contributors/sponsoring-an-open-source-contributor
23+
- /sponsors/sponsoring-open-source-contributors/sponsoring-an-open-source-contributor-through-github
2424
- /sponsors/getting-started-with-github-sponsors/about-github-sponsors
2525
- /sponsors/receiving-sponsorships-through-github-sponsors/tax-information-for-github-sponsors
2626
- /sponsors/sponsoring-open-source-contributors
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
title: Enabling sponsorships through Patreon
3+
intro: 'You can connect your Patreon and {% data variables.product.prodname_dotcom %} accounts to receive {% data variables.product.prodname_sponsors %} sponsorships through Patreon.'
4+
versions:
5+
fpt: '*'
6+
ghec: '*'
7+
type: how_to
8+
topics:
9+
- Open Source
10+
- Sponsors payments
11+
shortTitle: Enable Patreon sponsorships
12+
---
13+
14+
## Prerequisites
15+
16+
- Create a Patreon account. For more information, see [Start my creator page on Patreon](https://support.patreon.com/hc/en-us/articles/115002958403-Start-my-creator-page-on-Patreon) in the Patreon documentation.
17+
- Set up a paid membership tier on Patreon. For more information, see [How to set up paid tiers and benefits](https://support.patreon.com/hc/en-us/articles/203913559-How-to-set-up-paid-tiers-and-benefits) in the Patreon documentation.
18+
- Link your Patreon account to your {% data variables.product.prodname_dotcom %} account. For more information, see "[Linking your Patreon account to your {% data variables.product.prodname_dotcom %} account](#linking-your-patreon-account-to-your-github-account)."
19+
20+
## Linking your Patreon account to your {% data variables.product.prodname_dotcom %} account
21+
22+
{% data reusables.sponsors.link-patreon-account %} You can now receive sponsorships through Patreon on {% data variables.product.prodname_dotcom %}.

content/sponsors/receiving-sponsorships-through-github-sponsors/index.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ children:
1313
- /about-github-sponsors-for-open-source-contributors
1414
- /setting-up-github-sponsors-for-your-personal-account
1515
- /setting-up-github-sponsors-for-your-organization
16+
- /enabling-sponsorships-through-patreon
1617
- /using-a-fiscal-host-to-receive-github-sponsors-payouts
1718
- /editing-your-profile-details-for-github-sponsors
1819
- /managing-your-sponsorship-goal
@@ -21,7 +22,7 @@ children:
2122
- /managing-your-payouts-from-github-sponsors
2223
- /contacting-your-sponsors
2324
- /tax-information-for-github-sponsors
25+
- /unlinking-your-patreon-account-from-your-github-sponsors-profile
2426
- /disabling-your-github-sponsors-account
2527
- /unpublishing-your-github-sponsors-profile
2628
---
27-
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
title: Unlinking your Patreon account from your GitHub Sponsors profile
3+
intro: 'You can disconnect your Patreon account from your {% data variables.product.prodname_sponsors %} profile to stop receiving new sponsorships through Patreon.'
4+
versions:
5+
fpt: '*'
6+
ghec: '*'
7+
type: how_to
8+
topics:
9+
- Open Source
10+
- Sponsors payments
11+
shortTitle: Unlink Patreon
12+
---
13+
14+
{% note %}
15+
16+
**Note:** Unlinking your Patreon account from your {% data variables.product.prodname_sponsors %} profile will prevent new sponsors from sponsoring you through Patreon, but it **will not** cancel existing sponsorships through Patreon. Instead, your sponsors will have to cancel those sponsorships themselves. For more information, see [Cancelling my membership](https://support.patreon.com/hc/en-us/articles/9123489083277-Cancelling-my-membership) in the Patreon documentation.
17+
18+
{% endnote %}
19+
20+
{% data reusables.sponsors.unlink-patreon-account %}
Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
---
2+
title: About sponsorships, fees, and taxes
3+
intro: Learn about sponsorships, payment, and tax information for {% data variables.product.prodname_sponsors %}.
4+
versions:
5+
fpt: '*'
6+
ghec: '*'
7+
type: overview
8+
topics:
9+
- Open Source
10+
- Organizations
11+
- Sponsors profile
12+
shortTitle: About sponsorships
13+
allowTitleToDifferFromFilename: true
14+
---
15+
16+
## About sponsorships
17+
18+
{% data reusables.sponsors.sponsorship-details %}
19+
20+
You can sponsor an account on behalf of your personal account to invest in projects that you personally benefit from. You can sponsor an account on behalf of your organization for many reasons.
21+
- Sustaining specific libraries that your organization's work depends on
22+
- Investing in the ecosystem you rely on as an organization (such as blockchain)
23+
- Developing brand awareness as an organization that values open source
24+
- Thanking open source developers for building libraries that complement the product your organization offers
25+
26+
We may share certain limited tax information with sponsored accounts. For more information, see "[Tax information](#tax-information)."
27+
28+
You can choose whether to display your sponsorship publicly. One-time sponsorships remain visible for one month.
29+
30+
If the sponsored account retires your tier, the tier will remain in place for you until you choose a different tier or cancel your subscription. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-sponsors/upgrading-a-sponsorship)" and "[AUTOTITLE](/billing/managing-billing-for-github-sponsors/downgrading-a-sponsorship)."
31+
32+
If the account you want to sponsor does not have a profile on {% data variables.product.prodname_sponsors %}, you can encourage the account to join. For more information, see "[AUTOTITLE](/sponsors/receiving-sponsorships-through-github-sponsors/setting-up-github-sponsors-for-your-personal-account)" and "[AUTOTITLE](/sponsors/receiving-sponsorships-through-github-sponsors/setting-up-github-sponsors-for-your-organization)."
33+
34+
{% note %}
35+
36+
**Note:** {% data variables.product.prodname_dotcom %} is not responsible for how developers represent themselves nor does {% data variables.product.prodname_dotcom %} endorse any sponsored open source projects. The claims are solely the responsibility of the developer receiving the funds. Make sure you trust a person before offering a sponsorship. For more information, see the [{% data variables.product.prodname_sponsors %} Additional Terms](/free-pro-team@latest/site-policy/github-terms/github-sponsors-additional-terms).
37+
38+
{% endnote %}
39+
40+
## About payment methods for sponsorships
41+
42+
You can pay for sponsorships:
43+
- With a credit card. For more information, see "[AUTOTITLE](/sponsors/sponsoring-open-source-contributors/sponsoring-an-open-source-contributor-through-github)."
44+
- Through Patreon. For more information, see "[AUTOTITLE](/sponsors/sponsoring-open-source-contributors/sponsoring-an-open-source-contributor-through-patreon)."
45+
46+
{% note %}
47+
48+
**Note:** When you sponsor an account using a credit card, the charge will become effective immediately. {% data reusables.sponsors.prorated-sponsorship %}
49+
50+
{% endnote %}
51+
52+
Organizations can also pay for sponsorships by invoice. For more information, see "[AUTOTITLE](/sponsors/sponsoring-open-source-contributors/paying-for-github-sponsors-by-invoice)."
53+
54+
{% ifversion enterprise-orgs-sponsors-with-cc %}
55+
56+
If your enterprise pays by credit card, you can allow your enterprise's organizations to sponsor open source contributors using the credit card. For more information, see "[AUTOTITLE](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-github-sponsors-in-your-enterprise)."
57+
58+
{% endif %}
59+
60+
## Sponsorship fees
61+
62+
{% data reusables.sponsors.no-fees %}
63+
64+
For more information on fees and billing, see "[AUTOTITLE](/billing/managing-billing-for-github-sponsors/about-billing-for-github-sponsors)."
65+
66+
## Tax information
67+
68+
As a sponsor, you acknowledge that we may disclose to the owner of each account you sponsor the following limited information about your sponsorship payments to the account, since the inception of the Sponsors Program:
69+
70+
- Transaction date
71+
- Amount paid
72+
- The country, state, and province from where payment was made
73+
- Whether payment was made by a business or individual
74+
75+
This information is necessary to enable payment and reporting of any taxes arising from such sponsorship payments.
76+
77+
{% data reusables.sponsors.sponsorships-not-tax-deductible %}

content/sponsors/sponsoring-open-source-contributors/index.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@ versions:
99
fpt: '*'
1010
ghec: '*'
1111
children:
12-
- /sponsoring-an-open-source-contributor
12+
- /about-sponsorships-fees-and-taxes
13+
- /sponsoring-an-open-source-contributor-through-github
14+
- /sponsoring-an-open-source-contributor-through-patreon
1315
- /managing-your-sponsorship
1416
- /attributing-sponsorships-to-your-organization
1517
- /paying-for-github-sponsors-by-invoice
18+
- /unlinking-your-patreon-account-from-your-github-account
1619
shortTitle: Sponsor contributors
1720
---
18-

0 commit comments

Comments
 (0)