Skip to content

Commit 613de1c

Browse files
OctomergerOctomerger
authored
Merge pull request #12943 from github/repo-sync
repo sync
2 parents 9503b7d + 7be8148 commit 613de1c

8 files changed

Lines changed: 83 additions & 42 deletions

File tree

‎components/page-header/VersionPicker.tsx‎

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,32 +21,37 @@ export const VersionPicker = ({ variant }: Props) => {
2121
return null
2222
}
2323

24+
const allLinks = (page.permalinks || []).map((permalink) => ({
25+
text: permalink.pageVersionTitle,
26+
selected: allVersions[currentVersion].versionTitle === permalink.pageVersionTitle,
27+
item: <Link href={permalink.href}>{permalink.pageVersionTitle}</Link>,
28+
}))
29+
const hasEnterpriseVersions = (page.permalinks || []).find((permalink) =>
30+
permalink.pageVersion.startsWith('enterprise-version')
31+
)
32+
33+
if (hasEnterpriseVersions) {
34+
allLinks.push({
35+
text: t('all_enterprise_releases'),
36+
selected: false,
37+
item: (
38+
<Link
39+
href={`/${router.locale}/${enterpriseServerVersions[0]}/admin/all-releases`}
40+
className="f6 no-underline color-fg-muted"
41+
>
42+
{t('all_enterprise_releases')}{' '}
43+
<ArrowRightIcon verticalAlign="middle" size={15} className="mr-2" />
44+
</Link>
45+
),
46+
})
47+
}
48+
2449
return (
2550
<Picker
2651
variant={variant}
2752
data-testid="version-picker"
2853
defaultText="Choose version"
29-
options={(page.permalinks || [])
30-
.map((permalink) => ({
31-
text: permalink.pageVersionTitle,
32-
selected: allVersions[currentVersion].versionTitle === permalink.pageVersionTitle,
33-
item: <Link href={permalink.href}>{permalink.pageVersionTitle}</Link>,
34-
}))
35-
.concat([
36-
{
37-
text: t('all_enterprise_releases'),
38-
selected: false,
39-
item: (
40-
<Link
41-
href={`/${router.locale}/${enterpriseServerVersions[0]}/admin/all-releases`}
42-
className="f6 no-underline color-fg-muted"
43-
>
44-
{t('all_enterprise_releases')}{' '}
45-
<ArrowRightIcon verticalAlign="middle" size={15} className="mr-2" />
46-
</Link>
47-
),
48-
},
49-
])}
54+
options={allLinks}
5055
/>
5156
)
5257
}

‎content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-server.md‎

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -61,38 +61,23 @@ The peak quantity of concurrent jobs running without performance loss depends on
6161

6262
{%- ifversion ghes < 3.2 %}
6363

64-
| vCPUs | Memory | Maximum job throughput |
65-
| :--- | :--- | :--- |
66-
| 4 | 32 GB | Demo or light testing |
67-
| 8 | 64 GB | 25 jobs |
68-
| 16 | 160 GB | 35 jobs |
69-
| 32 | 256 GB | 100 jobs |
64+
{% data reusables.actions.hardware-requirements-before %}
7065

7166
{%- endif %}
7267

7368
{%- ifversion ghes = 3.2 %}
7469

75-
| vCPUs | Memory | Maximum Concurrency*|
76-
| :--- | :--- | :--- |
77-
| 32 | 128 GB | 1000 jobs |
78-
| 64 | 256 GB | 1300 jobs |
79-
| 96 | 384 GB | 2200 jobs |
70+
{% data reusables.actions.hardware-requirements-3.2 %}
8071

81-
*Maximum concurrency was measured using multiple repositories, job duration of approximately 10 minutes, and 10 MB artifact uploads. You may experience different performance depending on the overall levels of activity on your instance.
72+
Maximum concurrency was measured using multiple repositories, job duration of approximately 10 minutes, and 10 MB artifact uploads. You may experience different performance depending on the overall levels of activity on your instance.
8273

8374
{%- endif %}
8475

8576
{%- ifversion ghes > 3.2 %}
8677

87-
| vCPUs | Memory | Maximum Concurrency*|
88-
| :--- | :--- | :--- |
89-
| 8 | 64 GB | 300 jobs |
90-
| 16 | 160 GB | 700 jobs |
91-
| 32 | 128 GB | 1300 jobs |
92-
| 64 | 256 GB | 2000 jobs |
93-
| 96 | 384 GB | 4000 jobs |
78+
{% data reusables.actions.hardware-requirements-after %}
9479

95-
*Maximum concurrency was measured using multiple repositories, job duration of approximately 10 minutes, and 10 MB artifact uploads. You may experience different performance depending on the overall levels of activity on your instance.
80+
Maximum concurrency was measured using multiple repositories, job duration of approximately 10 minutes, and 10 MB artifact uploads. You may experience different performance depending on the overall levels of activity on your instance.
9681

9782
{%- endif %}
9883

‎data/reusables/actions/ae-beta.md‎

Whitespace-only changes.

‎data/reusables/actions/hardware-requirements-3.2.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
| vCPUs | Memory | Maximum Concurrency |
2+
| :--- | :--- | :--- |
3+
| 32 | 128 GB | 1000 jobs |
4+
| 64 | 256 GB | 1300 jobs |
5+
| 96 | 384 GB | 2200 jobs |

‎data/reusables/actions/hardware-requirements-after.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
| vCPUs | Memory | Maximum Concurrency |
2+
| :--- | :--- | :--- |
3+
| 8 | 64 GB | 300 jobs |
4+
| 16 | 160 GB | 700 jobs |
5+
| 32 | 128 GB | 1300 jobs |
6+
| 64 | 256 GB | 2000 jobs |
7+
| 96 | 384 GB | 4000 jobs |

‎data/reusables/actions/hardware-requirements-before.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
| vCPUs | Memory | Maximum job throughput |
2+
| :--- | :--- | :--- |
3+
| 4 | 32 GB | Demo or light testing |
4+
| 8 | 64 GB | 25 jobs |
5+
| 16 | 160 GB | 35 jobs |
6+
| 32 | 256 GB | 100 jobs |

‎data/reusables/enterprise_installation/hardware-rec-table.md‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,27 @@
2222

2323
{% ifversion ghes %}
2424

25-
If you plan to enable {% data variables.product.prodname_actions %} for the users of your instance, review the requirements for hardware, external storage, and runners in "[Getting started with {% data variables.product.prodname_actions %} for {% data variables.product.prodname_ghe_server %}](/admin/github-actions/getting-started-with-github-actions-for-github-enterprise-server)."
25+
If you plan to enable {% data variables.product.prodname_actions %} for the users of your instance, more resources are required.
26+
27+
{%- ifversion ghes < 3.2 %}
28+
29+
{% data reusables.actions.hardware-requirements-before %}
30+
31+
{%- endif %}
32+
33+
{%- ifversion ghes = 3.2 %}
34+
35+
{% data reusables.actions.hardware-requirements-3.2 %}
36+
37+
{%- endif %}
38+
39+
{%- ifversion ghes > 3.2 %}
40+
41+
{% data reusables.actions.hardware-requirements-after %}
42+
43+
{%- endif %}
44+
45+
For more information about these requirements, see "[Getting started with {% data variables.product.prodname_actions %} for {% data variables.product.prodname_ghe_server %}](/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-server#review-hardware-considerations)."
2646

2747
{% endif %}
2848

‎tests/translations/empty-sources-test.js‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import {execSync} from 'child_process'
2+
3+
describe('source directories', () => {
4+
// crowdin upload sources command fails if there are empty source files
5+
// please refer to crowdin-support #117 for more details
6+
it('should not contain empty files', () => {
7+
const command = "find content data -type f -empty"
8+
const emptyFiles = execSync(command).toString().split("\n")
9+
const disallowedEmptyFiles = emptyFiles.filter(file => file.match(/\.(yml|md)$/))
10+
11+
expect(disallowedEmptyFiles).toEqual([])
12+
})
13+
})

0 commit comments

Comments
 (0)