Skip to content

Commit 0e1b63a

Browse files
authored
Rename script for more clarity (#386)
* Rename script for more clarity * Misc
1 parent 1f959cd commit 0e1b63a

File tree

7 files changed

+14
-16
lines changed

7 files changed

+14
-16
lines changed

.github/scripts/generate-release-contributors.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,5 +85,5 @@ echo $contributors1 $contributors2 \
8585
| grep -v linux-foundation-easycla \
8686
| grep -v github-actions \
8787
| grep -v dependabot \
88-
| grep -v opentelemetry-java-bot \
88+
| grep -v opentelemetrybot \
8989
| sed 's/^/@/'
File renamed without changes.

.github/workflows/backport.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jobs:
2121
# history is needed to run git cherry-pick below
2222
fetch-depth: 0
2323

24-
- name: Set git user
25-
run: .github/scripts/set-git-user.sh
24+
- name: Use CLA approved github bot
25+
run: .github/scripts/use-cla-approved-github-bot.sh
2626

2727
- name: Create pull request
2828
env:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ jobs:
3939
date=$(date "+%Y-%m-%d")
4040
sed -Ei "s/^## Unreleased$/## Version $VERSION ($date)/" CHANGELOG.md
4141
42-
- name: Set git user
43-
run: .github/scripts/set-git-user.sh
42+
- name: Use CLA approved github bot
43+
run: .github/scripts/use-cla-approved-github-bot.sh
4444

4545
- name: Create pull request
4646
env:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ jobs:
4949
date=$(date "+%Y-%m-%d")
5050
sed -Ei "s/^## Unreleased$/## Version $VERSION ($date)/" CHANGELOG.md
5151
52-
- name: Set git user
53-
run: .github/scripts/set-git-user.sh
52+
- name: Use CLA approved github bot
53+
run: .github/scripts/use-cla-approved-github-bot.sh
5454

5555
- name: Create pull request against the release branch
5656
env:
@@ -97,8 +97,8 @@ jobs:
9797
date=$(date "+%Y-%m-%d")
9898
sed -Ei "s/^## Unreleased$/## Unreleased\n\n## Version $VERSION ($date)/" CHANGELOG.md
9999
100-
- name: Set git user
101-
run: .github/scripts/set-git-user.sh
100+
- name: Use CLA approved github bot
101+
run: .github/scripts/use-cla-approved-github-bot.sh
102102

103103
- name: Create pull request against main
104104
env:

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,8 @@ jobs:
235235
cp /tmp/CHANGELOG.md CHANGELOG.md
236236
fi
237237
238-
- name: Set git user
239-
run: .github/scripts/set-git-user.sh
238+
- name: Use CLA approved github bot
239+
run: .github/scripts/use-cla-approved-github-bot.sh
240240

241241
- name: Create pull request against main
242242
env:

.github/workflows/reusable-create-collector-contrib-pull-request.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
steps:
2929
- uses: actions/checkout@v3
3030
with:
31-
repository: opentelemetry-java-bot/opentelemetry-collector-contrib
31+
repository: opentelemetrybot/opentelemetry-collector-contrib
3232
# this is the personal access token used for "git push" below
3333
token: ${{ secrets.BOT_TOKEN }}
3434

@@ -49,10 +49,8 @@ jobs:
4949
sed "/^var jmxMetricsGathererVersions/a \ \"$HASH\": {\n version: \"$VERSION\",\n jar: \"JMX metrics gatherer\",\n }," receiver/jmxreceiver/supported_jars.go
5050
git diff
5151
52-
- name: Set git user
53-
run: |
54-
git config user.name opentelemetry-java-bot
55-
git config user.email [email protected]
52+
- name: Use CLA approved github bot
53+
run: .github/scripts/use-cla-approved-github-bot.sh
5654

5755
- name: Create pull request against opentelemetry-collector-contrib
5856
env:

0 commit comments

Comments
 (0)