Skip to content

Commit ca0f7cf

Browse files
authored
Merge pull request #33672 from github/repo-sync
Repo sync
2 parents 6421709 + 7c07509 commit ca0f7cf

File tree

7 files changed

+8
-10
lines changed

7 files changed

+8
-10
lines changed

content/actions/security-guides/using-artifact-attestations-and-reusable-workflows-to-achieve-slsa-v1-build-level-3.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ versions:
1414
ghec: '*'
1515
---
1616

17-
{% data reusables.actions.artifact-attestations-public-beta-note %}
18-
1917
## Introduction
2018

2119
Artifact attestations are a great way to create unfalsifiable provenance and integrity guarantees for the software you build.

content/actions/security-guides/using-artifact-attestations-to-establish-provenance-for-builds.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ versions:
77
shortTitle: Artifact attestations
88
---
99

10-
{% data reusables.actions.artifact-attestations-public-beta-note %}
11-
1210
## About artifact attestations
1311

1412
{% data reusables.actions.about-artifact-attestations %}

content/actions/using-workflows/storing-workflow-data-as-artifacts.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,6 @@ jobs:
124124
125125
## Generating artifact attestations for builds
126126
127-
{% data reusables.actions.artifact-attestations-public-beta-note %}
128-
129127
{% data reusables.actions.about-artifact-attestations %}
130128
131129
You can access attestations after a build run, underneath the list of the artifacts the build produced.

content/admin/monitoring-managing-and-updating-your-instance/updating-the-virtual-machine-and-physical-resources/known-issues-with-upgrades-to-your-instance.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,3 +203,10 @@ For more information about restoring from a failed upgrade, see "[AUTOTITLE](/ad
203203

204204
If your appliance averages more than 70% CPU utilization, {% data variables.product.company_short %} strongly recommends scaling up your server resources before upgrading to 3.11 or above. The new hardware or instance type should have more vCPUs to accommodate the additional load from new features and improvements included with the latest releases.
205205
{% endif %}
206+
207+
{% ifversion ghes > 3.12 and ghes < 3.15 %}
208+
209+
## Elasticsearch Upgrade
210+
211+
As part of upgrading GitHub Enterprise Server to version 3.13 or later, the Elasticsearch service will be upgraded. {% data variables.product.company_short %} strongly recommends following the guidance in "[AUTOTITLE](/admin/monitoring-managing-and-updating-your-instance/updating-the-virtual-machine-and-physical-resources/preparing-for-the-elasticsearch-upgrade)."
212+
{% endif %}

content/code-security/supply-chain-security/end-to-end-supply-chain/securing-builds.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ In addition to the security benefits, {% data variables.product.prodname_actions
4343

4444
## Generate artifact attestations for your builds
4545

46-
{% data reusables.actions.artifact-attestations-public-beta-note %}
47-
4846
{% data reusables.actions.about-artifact-attestations %}
4947

5048
Artifact attestations include a signature over a built artifact, along with links to the source code and build instructions. If you sign your build with artifact attestations, you do not have to manage your own signing key material. {% data variables.product.prodname_dotcom %} handles this for you with the signing authority we operate.

data/reusables/actions/artifact-attestations-public-beta-note.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/audit-logs/lib/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
"apiOnlyEvents": "This event is not available in the web interface, only via the REST API, audit log streaming, or JSON/CSV exports.",
44
"apiRequestEvent": "This event is only available via audit log streaming."
55
},
6-
"sha": "696298e01ede2e0c4b5b112aed8cccf548c35511"
6+
"sha": "722817aced5cc835d69929a16d3424b50298ec6f"
77
}

0 commit comments

Comments
 (0)