Skip to content

Commit 63bceec

Browse files
emdnetoemdneto
authored
Merge branch 'main' into gc_count_collection_unit
2 parents 8a51981 + c30b8fa commit 63bceec

File tree

10 files changed

+72
-24
lines changed

10 files changed

+72
-24
lines changed

‎.github/scripts/use-cla-approved-github-bot.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/bash -e
22

3-
git config user.name opentelemetrybot
4-
git config user.email 107717825+opentelemetrybot@users.noreply.github.com
3+
git config user.name otelbot
4+
git config user.email 197425009+otelbot@users.noreply.github.com

‎.github/workflows/backport.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,22 @@ jobs:
2424
- name: Use CLA approved github bot
2525
run: .github/scripts/use-cla-approved-github-bot.sh
2626

27+
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
28+
id: otelbot-token
29+
with:
30+
app-id: ${{ vars.OTELBOT_APP_ID }}
31+
private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
32+
2733
- name: Create pull request
2834
env:
2935
NUMBER: ${{ github.event.inputs.number }}
3036
# not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows
31-
GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
37+
GITHUB_TOKEN: ${{ steps.otelbot-token.outputs.token }}
3238
run: |
3339
commit=$(gh pr view $NUMBER --json mergeCommit --jq .mergeCommit.oid)
3440
title=$(gh pr view $NUMBER --json title --jq .title)
3541
36-
branch="opentelemetrybot/backport-${NUMBER}-to-${GITHUB_REF_NAME//\//-}"
42+
branch="otelbot/backport-${NUMBER}-to-${GITHUB_REF_NAME//\//-}"
3743
3844
git cherry-pick $commit
3945
git push origin HEAD:$branch

‎.github/workflows/changelog.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
if: |
1717
!contains(github.event.pull_request.labels.*.name, 'Skip Changelog')
18-
&& github.actor != 'opentelemetrybot'
18+
&& github.actor != 'otelbot[bot]'
1919
2020
steps:
2121
- uses: actions/checkout@v4

‎.github/workflows/generate_workflows_lib/src/generate_workflows_lib/misc.yml.j2‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ jobs:
3636
{%- if job_data == "generate-workflows" %}
3737
if: |
3838
!contains(github.event.pull_request.labels.*.name, 'Skip generate-workflows')
39-
&& github.event.pull_request.user.login != 'opentelemetrybot' && github.event_name == 'pull_request'
39+
&& github.event.pull_request.user.login != 'otelbot[bot]' && github.event_name == 'pull_request'
4040
{%- endif %}
4141
{%- if job_data == "public-symbols-check" %}
4242
if: |
4343
!contains(github.event.pull_request.labels.*.name, 'Approve Public API check')
44-
&& github.actor != 'opentelemetrybot' && github.event_name == 'pull_request'
44+
&& github.actor != 'otelbot[bot]' && github.event_name == 'pull_request'
4545
{%- endif %}
4646
{%- if job_data == "docs" %}
4747
if: |
48-
github.event.pull_request.user.login != 'opentelemetrybot' && github.event_name == 'pull_request'
48+
github.event.pull_request.user.login != 'otelbot[bot]' && github.event_name == 'pull_request'
4949
{%- endif %}
5050
steps:
5151
- name: Checkout repo @ SHA - ${% raw %}{{ github.sha }}{% endraw %}

‎.github/workflows/misc_0.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
runs-on: ubuntu-latest
7272
timeout-minutes: 30
7373
if: |
74-
github.event.pull_request.user.login != 'opentelemetrybot' && github.event_name == 'pull_request'
74+
github.event.pull_request.user.login != 'otelbot[bot]' && github.event_name == 'pull_request'
7575
steps:
7676
- name: Checkout repo @ SHA - ${{ github.sha }}
7777
uses: actions/checkout@v4
@@ -115,7 +115,7 @@ jobs:
115115
timeout-minutes: 30
116116
if: |
117117
!contains(github.event.pull_request.labels.*.name, 'Skip generate-workflows')
118-
&& github.event.pull_request.user.login != 'opentelemetrybot' && github.event_name == 'pull_request'
118+
&& github.event.pull_request.user.login != 'otelbot[bot]' && github.event_name == 'pull_request'
119119
steps:
120120
- name: Checkout repo @ SHA - ${{ github.sha }}
121121
uses: actions/checkout@v4

‎.github/workflows/package-prepare-patch-release.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,19 @@ jobs:
105105
- name: Use CLA approved github bot
106106
run: .github/scripts/use-cla-approved-github-bot.sh
107107

108+
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
109+
id: otelbot-token
110+
with:
111+
app-id: ${{ vars.OTELBOT_APP_ID }}
112+
private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
113+
108114
- name: Create pull request
109115
env:
110116
# not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows
111-
GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
117+
GITHUB_TOKEN: ${{ steps.otelbot-token.outputs.token }}
112118
run: |
113119
message="Prepare patch release for ${PACKAGE_NAME} v${NEXT_VERSION}"
114-
branch="opentelemetrybot/patch-${PACKAGE_NAME}-version-to-v${NEXT_VERSION}"
120+
branch="otelbot/patch-${PACKAGE_NAME}-version-to-v${NEXT_VERSION}"
115121
116122
git commit -a -m "$message"
117123
git push origin HEAD:$branch

‎.github/workflows/package-prepare-release.yml‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,19 @@ jobs:
129129
- name: Use CLA approved github bot
130130
run: .github/scripts/use-cla-approved-github-bot.sh
131131

132+
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
133+
id: otelbot-token
134+
with:
135+
app-id: ${{ vars.OTELBOT_APP_ID }}
136+
private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
137+
132138
- name: Create pull request against the release branch
133139
env:
134140
# not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows
135-
GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
141+
GITHUB_TOKEN: ${{ steps.otelbot-token.outputs.token }}
136142
run: |
137143
message="Prepare release for ${PACKAGE_NAME} v${VERSION}"
138-
branch="opentelemetrybot/prepare-${RELEASE_BRANCH_NAME}"
144+
branch="otelbot/prepare-${RELEASE_BRANCH_NAME}"
139145
140146
git commit -a -m "$message"
141147
git push origin HEAD:$branch
@@ -181,14 +187,20 @@ jobs:
181187
- name: Use CLA approved github bot
182188
run: .github/scripts/use-cla-approved-github-bot.sh
183189

190+
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
191+
id: otelbot-token-main
192+
with:
193+
app-id: ${{ vars.OTELBOT_APP_ID }}
194+
private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
195+
184196
- name: Create pull request against main
185197
env:
186198
# not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows
187-
GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
199+
GITHUB_TOKEN: ${{ steps.otelbot-token-main.outputs.token }}
188200
run: |
189201
message="Update ${PACKAGE_NAME} version to v${NEXT_VERSION}"
190202
body="Update \`${PACKAGE_NAME}\` version to v\`${NEXT_VERSION}\`."
191-
branch="opentelemetrybot/update-${PACKAGE_NAME}-version-to-v${NEXT_VERSION}"
203+
branch="otelbot/update-${PACKAGE_NAME}-version-to-v${NEXT_VERSION}"
192204
193205
git commit -a -m "$message"
194206
git push origin HEAD:$branch

‎.github/workflows/package-release.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,14 +136,20 @@ jobs:
136136
- name: Use CLA approved github bot
137137
run: .github/scripts/use-cla-approved-github-bot.sh
138138

139+
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
140+
id: otelbot-token
141+
with:
142+
app-id: ${{ vars.OTELBOT_APP_ID }}
143+
private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
144+
139145
- name: Create pull request against main
140146
env:
141147
# not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows
142-
GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
148+
GITHUB_TOKEN: ${{ steps.otelbot-token.outputs.token }}
143149
run: |
144150
message="Copy changelog updates from $GITHUB_REF_NAME"
145151
body="Copy changelog updates from \`$GITHUB_REF_NAME\`."
146-
branch="opentelemetrybot/changelog-${GITHUB_REF_NAME//\//-}"
152+
branch="otelbot/changelog-${GITHUB_REF_NAME//\//-}"
147153
148154
if [[ -z $PRIOR_VERSION_WHEN_PATCH ]]; then
149155
if git diff --quiet; then

‎.github/workflows/prepare-patch-release.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,20 @@ jobs:
7070
- name: Use CLA approved github bot
7171
run: .github/scripts/use-cla-approved-github-bot.sh
7272

73+
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
74+
id: otelbot-token
75+
with:
76+
app-id: ${{ vars.OTELBOT_APP_ID }}
77+
private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
78+
7379
- name: Create pull request
7480
id: create_pr
7581
env:
7682
# not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows
77-
GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
83+
GITHUB_TOKEN: ${{ steps.otelbot-token.outputs.token }}
7884
run: |
7985
message="Prepare release ${STABLE_VERSION}/${UNSTABLE_VERSION}"
80-
branch="opentelemetrybot/prepare-release-${STABLE_VERSION}-${UNSTABLE_VERSION}"
86+
branch="otelbot/prepare-release-${STABLE_VERSION}-${UNSTABLE_VERSION}"
8187
8288
git commit -a -m "$message"
8389
git push origin HEAD:$branch

‎.github/workflows/prepare-release-branch.yml‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,20 @@ jobs:
9393
- name: Use CLA approved github bot
9494
run: .github/scripts/use-cla-approved-github-bot.sh
9595

96+
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
97+
id: otelbot-token
98+
with:
99+
app-id: ${{ vars.OTELBOT_APP_ID }}
100+
private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
101+
96102
- name: Create pull request against the release branch
97103
id: create_release_branch_pr
98104
env:
99105
# not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows
100-
GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
106+
GITHUB_TOKEN: ${{ steps.otelbot-token.outputs.token }}
101107
run: |
102108
message="Prepare release ${STABLE_VERSION}/${UNSTABLE_VERSION}"
103-
branch="opentelemetrybot/prepare-release-${STABLE_VERSION}-${UNSTABLE_VERSION}"
109+
branch="otelbot/prepare-release-${STABLE_VERSION}-${UNSTABLE_VERSION}"
104110
105111
git commit -a -m "$message"
106112
git push origin HEAD:$branch
@@ -187,15 +193,21 @@ jobs:
187193
- name: Use CLA approved github bot
188194
run: .github/scripts/use-cla-approved-github-bot.sh
189195

196+
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
197+
id: otelbot-token-main
198+
with:
199+
app-id: ${{ vars.OTELBOT_APP_ID }}
200+
private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
201+
190202
- name: Create pull request against main
191203
id: create_main_pr
192204
env:
193205
# not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows
194-
GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
206+
GITHUB_TOKEN: ${{ steps.otelbot-token-main.outputs.token }}
195207
run: |
196208
message="Update version to ${STABLE_NEXT_VERSION}/${UNSTABLE_NEXT_VERSION}"
197209
body="Update version to \`${STABLE_NEXT_VERSION}/${UNSTABLE_NEXT_VERSION}\`."
198-
branch="opentelemetrybot/update-version-to-${STABLE_NEXT_VERSION}-${UNSTABLE_NEXT_VERSION}"
210+
branch="otelbot/update-version-to-${STABLE_NEXT_VERSION}-${UNSTABLE_NEXT_VERSION}"
199211
200212
git commit -a -m "$message"
201213
git push origin HEAD:$branch

0 commit comments

Comments
 (0)