From 514ae2c9753cb92d4e3f665ae562703dfaf8abf0 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 18 Jul 2022 15:57:46 -0700 Subject: [PATCH] Switch to opentelemetrybot account (#4591) --- .github/scripts/set-git-user.sh | 4 ---- .github/scripts/use-cla-approved-github-bot.sh | 4 ++++ .github/workflows/backport.yml | 4 ++-- .github/workflows/prepare-patch-release.yml | 4 ++-- .github/workflows/prepare-release-branch.yml | 8 ++++---- .github/workflows/release.yml | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) delete mode 100755 .github/scripts/set-git-user.sh create mode 100644 .github/scripts/use-cla-approved-github-bot.sh diff --git a/.github/scripts/set-git-user.sh b/.github/scripts/set-git-user.sh deleted file mode 100755 index 17f2c07ad3..0000000000 --- a/.github/scripts/set-git-user.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -e - -git config user.name opentelemetry-java-bot -git config user.email 97938252+opentelemetry-java-bot@users.noreply.github.com diff --git a/.github/scripts/use-cla-approved-github-bot.sh b/.github/scripts/use-cla-approved-github-bot.sh new file mode 100644 index 0000000000..a4c68b0e30 --- /dev/null +++ b/.github/scripts/use-cla-approved-github-bot.sh @@ -0,0 +1,4 @@ +#!/bin/bash -e + +git config user.name opentelemetrybot +git config user.email 107717825+opentelemetrybot@users.noreply.github.com diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 2bdc3a32d7..7cabc7ec6c 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -21,8 +21,8 @@ jobs: # history is needed to run git cherry-pick below fetch-depth: 0 - - name: Set git user - run: .github/scripts/set-git-user.sh + - name: Use CLA approved github bot + run: .github/scripts/use-cla-approved-github-bot.sh - name: Create pull request env: diff --git a/.github/workflows/prepare-patch-release.yml b/.github/workflows/prepare-patch-release.yml index ac13932a41..f3b0e341b2 100644 --- a/.github/workflows/prepare-patch-release.yml +++ b/.github/workflows/prepare-patch-release.yml @@ -39,8 +39,8 @@ jobs: date=$(date "+%Y-%m-%d") sed -Ei "s/^## Unreleased$/## Version $VERSION ($date)/" CHANGELOG.md - - name: Set git user - run: .github/scripts/set-git-user.sh + - name: Use CLA approved github bot + run: .github/scripts/use-cla-approved-github-bot.sh - name: Create pull request env: diff --git a/.github/workflows/prepare-release-branch.yml b/.github/workflows/prepare-release-branch.yml index 9a28a2f166..168042c4ff 100644 --- a/.github/workflows/prepare-release-branch.yml +++ b/.github/workflows/prepare-release-branch.yml @@ -49,8 +49,8 @@ jobs: date=$(date "+%Y-%m-%d") sed -Ei "s/^## Unreleased$/## Version $VERSION ($date)/" CHANGELOG.md - - name: Set git user - run: .github/scripts/set-git-user.sh + - name: Use CLA approved github bot + run: .github/scripts/use-cla-approved-github-bot.sh - name: Create pull request against the release branch env: @@ -96,8 +96,8 @@ jobs: date=$(date "+%Y-%m-%d") sed -Ei "s/^## Unreleased$/## Unreleased\n\n## Version $VERSION ($date)/" CHANGELOG.md - - name: Set git user - run: .github/scripts/set-git-user.sh + - name: Use CLA approved github bot + run: .github/scripts/use-cla-approved-github-bot.sh - name: Create pull request against main env: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ac3ba64e00..49a9670ea9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -175,8 +175,8 @@ jobs: cp /tmp/CHANGELOG.md CHANGELOG.md fi - - name: Set git user - run: .github/scripts/set-git-user.sh + - name: Use CLA approved github bot + run: .github/scripts/use-cla-approved-github-bot.sh - name: Create pull request against main env: