Skip to content

Commit 2f6961d

Browse files
authored
Merge c1a9577 into 450193c
2 parents 450193c + c1a9577 commit 2f6961d

34 files changed

Lines changed: 57581 additions & 28910 deletions

.github/workflows/integration.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -154,22 +154,24 @@ jobs:
154154
return endpoint({}).headers['user-agent']
155155
result-encoding: string
156156
- run: |
157+
# User-agent format: <prefix> [actions_orchestration_id/<id>] octokit-core.js/<version> ...
158+
# When ACTIONS_ORCHESTRATION_ID is set, the orchestration ID is inserted after the prefix
157159
echo "- Validating user-agent default"
158-
expected="actions/github-script octokit-core.js/"
159-
if [[ "${{steps.user-agent-default.outputs.result}}" != "$expected"* ]]; then
160-
echo $'::error::\u274C' "Expected user-agent to start with '$expected', got ${{steps.user-agent-default.outputs.result}}"
160+
ua="${{steps.user-agent-default.outputs.result}}"
161+
if [[ "$ua" != "actions/github-script"* ]] || [[ "$ua" != *"octokit-core.js/"* ]]; then
162+
echo $'::error::\u274C' "Expected user-agent to start with 'actions/github-script' and contain 'octokit-core.js/', got $ua"
161163
exit 1
162164
fi
163165
echo "- Validating user-agent set to a value"
164-
expected="foobar octokit-core.js/"
165-
if [[ "${{steps.user-agent-set.outputs.result}}" != "$expected"* ]]; then
166-
echo $'::error::\u274C' "Expected user-agent to start with '$expected', got ${{steps.user-agent-set.outputs.result}}"
166+
ua="${{steps.user-agent-set.outputs.result}}"
167+
if [[ "$ua" != "foobar"* ]] || [[ "$ua" != *"octokit-core.js/"* ]]; then
168+
echo $'::error::\u274C' "Expected user-agent to start with 'foobar' and contain 'octokit-core.js/', got $ua"
167169
exit 1
168170
fi
169171
echo "- Validating user-agent set to an empty string"
170-
expected="actions/github-script octokit-core.js/"
171-
if [[ "${{steps.user-agent-empty.outputs.result}}" != "$expected"* ]]; then
172-
echo $'::error::\u274C' "Expected user-agent to start with '$expected', got ${{steps.user-agent-empty.outputs.result}}"
172+
ua="${{steps.user-agent-empty.outputs.result}}"
173+
if [[ "$ua" != "actions/github-script"* ]] || [[ "$ua" != *"octokit-core.js/"* ]]; then
174+
echo $'::error::\u274C' "Expected user-agent to start with 'actions/github-script' and contain 'octokit-core.js/', got $ua"
173175
exit 1
174176
fi
175177
echo $'\u2705 Test passed' | tee -a $GITHUB_STEP_SUMMARY

.licenses/npm/@actions/github.dep.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.

.licenses/npm/@actions/http-client-3.0.2.dep.yml

Lines changed: 32 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.licenses/npm/@octokit/auth-token.dep.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.licenses/npm/@octokit/core.dep.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.licenses/npm/@octokit/endpoint.dep.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.licenses/npm/@octokit/graphql.dep.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.licenses/npm/@octokit/openapi-types-19.0.0.dep.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

.licenses/npm/@octokit/openapi-types-18.0.0.dep.yml renamed to .licenses/npm/@octokit/openapi-types.dep.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)