Skip to content

Commit e7c93f3

Browse files
authored
Merge pull request #36992 from github/repo-sync
Repo sync
2 parents d7df63e + 434a700 commit e7c93f3

File tree

26 files changed

+1090
-2524
lines changed

26 files changed

+1090
-2524
lines changed

.github/actions/get-changed-files/get-changed-files.sh

Lines changed: 34 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -28,26 +28,15 @@ then
2828
fi
2929

3030
if [ -z "$DIFF" ]; then
31+
# If HEAD was set from gh pr view but INPUT_HEAD is empty, use HEAD instead
32+
if [ -z "$INPUT_HEAD" ] && [ -n "$HEAD" ]; then
33+
INPUT_HEAD=$HEAD
34+
fi
3135
echo "__ using branch name $INPUT_HEAD __"
32-
git fetch origin main --depth 1
36+
git fetch origin $INPUT_HEAD:refs/remotes/origin/$INPUT_HEAD
3337
echo "__ running git diff __"
3438

35-
temp_file=$(mktemp)
36-
git diff --name-only origin/main $INPUT_HEAD > "$temp_file" 2>/dev/null
37-
GIT_EXIT_CODE=$?
38-
39-
DIFF=$(cat "$temp_file")
40-
rm -f "$temp_file"
41-
42-
if [ $GIT_EXIT_CODE -ne 0 ]; then
43-
echo "__ git diff failed with exit code $GIT_EXIT_CODE, fetching unshallow __"
44-
git fetch --depth=100 origin $INPUT_HEAD
45-
git diff --name-only origin/main $INPUT_HEAD > "$temp_file" 2>/dev/null
46-
DIFF=$(cat "$temp_file")
47-
rm -f "$temp_file"
48-
else
49-
echo "__ git diff succeeded __"
50-
fi
39+
DIFF=$(git diff --name-only origin/main origin/$INPUT_HEAD)
5140
fi
5241

5342
# So we can inspect the output
@@ -79,20 +68,36 @@ FORMATTED_DIFF=$(echo "$DIFF" | tr '\n' ' ' | tr -s ' ' | sed 's/^ *//' | sed 's
7968
echo "Formatted diff: '$FORMATTED_DIFF'"
8069

8170
# Set the output for GitHub Actions
82-
if [[ -n "$INPUT_OUTPUT_FILE" ]]; then
83-
ALL_FORMATTED=$(echo "$DIFF" | tr '\n' ' ' | tr -s ' ' | sed 's/^ *//' | sed 's/ *$//')
71+
ALL_FORMATTED=$(echo "$DIFF" | tr '\n' ' ' | tr -s ' ' | sed 's/^ *//' | sed 's/ *$//')
72+
HAS_CHANGES=true
73+
if [[ -z "$ALL_FORMATTED" ]]; then
74+
echo "No changed files detected"
75+
HAS_CHANGES=false
76+
fi
77+
78+
# Function to set outputs either to a file or GITHUB_OUTPUT
79+
set_outputs() {
80+
local target=$1
8481

85-
# Only set outputs if there are actually changed files
86-
if [[ -z "$ALL_FORMATTED" ]]; then
87-
echo "No changed files detected, setting empty outputs"
88-
echo "all_changed_files=" >> "$INPUT_OUTPUT_FILE"
89-
echo "filtered_changed_files=" >> "$INPUT_OUTPUT_FILE"
82+
if [[ "$HAS_CHANGES" == "false" ]]; then
83+
echo "Setting empty outputs to $target"
84+
echo "all_changed_files=" >> "$target"
85+
echo "filtered_changed_files=" >> "$target"
9086
else
91-
echo "Setting non-empty outputs"
92-
echo "all_changed_files=$ALL_FORMATTED" >> "$INPUT_OUTPUT_FILE"
93-
echo "filtered_changed_files=$FORMATTED_DIFF" >> "$INPUT_OUTPUT_FILE"
87+
echo "Setting non-empty outputs to $target"
88+
echo "all_changed_files<<EOF" >> "$target"
89+
echo "$ALL_FORMATTED" >> "$target"
90+
echo "EOF" >> "$target"
91+
92+
echo "filtered_changed_files<<EOF" >> "$target"
93+
echo "$FORMATTED_DIFF" >> "$target"
94+
echo "EOF" >> "$target"
9495
fi
96+
}
97+
98+
# Set outputs to the appropriate target
99+
if [[ -n "$INPUT_OUTPUT_FILE" ]]; then
100+
set_outputs "$INPUT_OUTPUT_FILE"
95101
else
96-
echo "all_changed_files='$DIFF'"
97-
echo "filtered_changed_files='$FORMATTED_DIFF'"
102+
set_outputs "$GITHUB_OUTPUT"
98103
fi

.github/workflows/reviewers-legal.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ jobs:
3939
uses: ./.github/actions/get-changed-files
4040
with:
4141
files: 'content/**'
42+
token: ${{ secrets.GITHUB_TOKEN }}
4243

4344
- name: Set up Node and dependencies
4445
if: steps.changed_files.outputs.filtered_changed_files

content/contributing/style-guide-and-content-model/style-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1374,7 +1374,7 @@ For tables that use symbols:
13741374
13751375
* Populate all cells. For example in a permissions table, do not mark only the cells for things that require a permission.
13761376
* Use octicons or SVG. Do not use emoji. For more information about octicons, see [AUTOTITLE](/contributing/syntax-and-versioning-for-github-docs/using-markdown-and-liquid-in-github-docs#octicons).
1377-
* Use a [check mark](https://primer.style/octicons/check-16) for affirmative values ("Yes", "Required", "Supported") and a [cross](https://primer.style/octicons/x-16) for negative values ("No", "Optional", "Unsupported").
1377+
* Use a [check mark](https://primer.style/octicons/icon/check-16) for affirmative values ("Yes", "Required", "Supported") and a [cross](https://primer.style/octicons/icon/x-16) for negative values ("No", "Optional", "Unsupported").
13781378
* Use `aria-label` to describe the meaning of the symbol, not its visual characteristics. For example, "Required", not "Check mark icon".
13791379
13801380
Where table data is not truly binary (every value is either "Yes" or "No", for example), text values may be needed in addition to, or instead of, symbols. For example on the page [AUTOTITLE](/support/learning-about-github-support/about-github-support), some features are marked as "Available to purchase".

content/contributing/writing-for-github-docs/creating-diagrams-for-github-docs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ Keys should be used to explain shapes, colors, or other visual elements. Keys ca
181181

182182
### Colors
183183

184-
If a diagram needs color, use colors defined in the [Primer Design System](https://primer.style/design/foundations/color). To make diagrams accessible to more people, color cannot be the only way to convey information. For example, if you use color to indicate a relationship, you must also use a line or other visual element to convey the same information.
184+
If a diagram needs color, use colors defined in the [Primer Design System](https://primer.style/product/getting-started/foundations/color-usage). To make diagrams accessible to more people, color cannot be the only way to convey information. For example, if you use color to indicate a relationship, you must also use a line or other visual element to convey the same information.
185185

186186
The preferred colors for diagrams in {% data variables.product.prodname_docs %} are:
187187

@@ -205,7 +205,7 @@ If you need to create a diagram that is difficult to view at small resolutions,
205205

206206
## Tools for creating diagrams
207207

208-
The recommended tool for using diagrams is Figma so that you have access to Primer colors and other assets. However, you can use another program if you prefer. Follow the shape conventions in the style guide above and use the colors defined in the [Primer Design System](https://primer.style/design/foundations/color#how-to-use-color-for-product-ui).
208+
The recommended tool for using diagrams is Figma so that you have access to Primer colors and other assets. However, you can use another program if you prefer. Follow the shape conventions in the style guide above and use the colors defined in the [Primer Design System](https://primer.style/product/getting-started/foundations/color-usage).
209209

210210
## Accessibility
211211

content/contributing/writing-for-github-docs/using-markdown-and-liquid-in-github-docs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ For an example of an article that uses code annotations on {% data variables.pro
146146

147147
## Octicons
148148

149-
Octicons are icons used across {% data variables.product.prodname_dotcom %}’s interface. We reference Octicons when documenting the user interface and to indicate binary values in tables. Find the name of specific Octicons on the [Octicons site](https://primer.style/Octicons).
149+
Octicons are icons used across {% data variables.product.prodname_dotcom %}’s interface. We reference Octicons when documenting the user interface and to indicate binary values in tables. Find the name of specific Octicons on the [Octicons site](https://primer.style/octicons).
150150

151151
If you're referencing an Octicon that appears in the UI, identify whether the Octicon is the entire label of the UI element (for example, a button that is labeled only with "+") or whether it's only decorative, in addition to another label (for example, a button is labeled "+ Add message").
152152

data/release-notes/enterprise-server/3-13/12.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ sections:
4444
When restoring data originally backed up from a 3.13 or greater appliance version, the elasticsearch indices need to be reindexed before some of the data will show up. This happens via a nightly scheduled job. It can also be forced by running `/usr/local/share/enterprise/ghe-es-search-repair`.
4545
- |
4646
When restoring from a backup snapshot, a large number of `mapper_parsing_exception` errors may be displayed.
47+
- |
48+
{% data reusables.release-notes.2025-03-03-elasticsearch-data-loss %}
49+
50+
[Updated: 2025-03-19]
4751
- |
4852
After a restore, existing outside collaborators are unable to be added to repositories in a new organization. This issue can be resolved by running `/usr/local/share/enterprise/ghe-es-search-repair` on the appliance.
4953
- |

data/release-notes/enterprise-server/3-14/9.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ sections:
5656
When enabling automatic update checks for the first time in the Management Console, the status is not dynamically reflected until the "Updates" page is reloaded.
5757
- |
5858
When restoring from a backup snapshot, a large number of `mapper_parsing_exception` errors may be displayed.
59+
- |
60+
{% data reusables.release-notes.2025-03-03-elasticsearch-data-loss %}
61+
62+
[Updated: 2025-03-19]
5963
- |
6064
After a restore, existing outside collaborators are unable to be added to repositories in a new organization. This issue can be resolved by running `/usr/local/share/enterprise/ghe-es-search-repair` on the appliance.
6165
- |

data/release-notes/enterprise-server/3-15/4.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,9 @@ sections:
6060
When initializing a new GHES cluster, nodes with the `consul-server` role should be added to the cluster before adding additional nodes. Adding all nodes simultaneously creates a race condition between nomad server registration and nomad client registration.
6161
- |
6262
Admins setting up cluster high availability (HA) may encounter a spokes error when running ghe-cluster-repl-status if a new organization and repositories are created before using the ghe-cluster-repl-bootstrap command. To avoid this issue, complete the cluster HA setup with ghe-cluster-repl-bootstrap before creating new organizations and repositories.
63+
- |
64+
{% data reusables.release-notes.2025-03-03-elasticsearch-data-loss %}
65+
66+
[Updated: 2025-03-19]
6367
- |
6468
After a restore, existing outside collaborators are unable to be added to repositories in a new organization. This issue can be resolved by running `/usr/local/share/enterprise/ghe-es-search-repair` on the appliance.

data/release-notes/enterprise-server/3-16/0.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ intro: |
77
**Warning**: Customers who have security products enabled by default at the organization level will experience issues when upgrading from 3.14 to 3.16.0. We recommend waiting for the next 3.16 patch to upgrade.
88
99
{% endwarning %}
10-
10+
1111
For upgrade instructions, see [AUTOTITLE](/admin/upgrading-your-instance/preparing-to-upgrade/overview-of-the-upgrade-process).
1212
sections:
1313

@@ -230,11 +230,9 @@ sections:
230230
- |
231231
After a geo-replica is promoted to primary by running `ghe-repl-promote`, the actions workflow of a repository does not have any suggested workflows.
232232
- |
233-
For appliances in a high availability configuration, Elasticsearch indices are deleted in two situations:
234-
* On failover
235-
* When running `ghe-repl-teardown <REPLICA_HOSTNAME>` from the primary instance
233+
{% data reusables.release-notes.2025-03-03-elasticsearch-data-loss %}
236234
237-
All indices are recoverable, except for Audit Log indices. Since Elasticsearch itself is the source of truth for these logs, they may only be recoverable from a backup. If you need assistance, visit {% data variables.contact.contact_ent_support %}.
235+
[Updated: 2025-03-19]
238236
239237
closing_down:
240238
# https://github.com/github/releases/issues/4683

src/github-apps/lib/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,5 @@
6060
"2022-11-28"
6161
]
6262
},
63-
"sha": "fcf38b85ce4642ed8f3c12970dc4420c5c97a66a"
63+
"sha": "fd8b14666d8a4e34411bee8dbd103edc8b81d0e3"
6464
}

0 commit comments

Comments
 (0)