Skip to content

fix sha-automation #3445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 28, 2025
+37 −17
Merged

fix sha-automation #3445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0af6ec3
fix sha-automation
emdneto Apr 25, 2025
38f38c2
use default github_token instead
emdneto Apr 25, 2025
8746339
Merge branch 'main' into fix-sha-automation
emdneto Apr 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/backport.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,4 @@ jobs:
gh pr create --title "[$GITHUB_REF_NAME] $title" \
--body "Clean cherry-pick of #$NUMBER to the \`$GITHUB_REF_NAME\` branch." \
--head $branch \
--base $GITHUB_REF_NAME \
--label backport
--base $GITHUB_REF_NAME
3 changes: 1 addition & 2 deletions .github/workflows/package-prepare-patch-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,5 +118,4 @@ jobs:
gh pr create --title "[$GITHUB_REF_NAME] $message" \
--body "$message." \
--head $branch \
--base $GITHUB_REF_NAME \
--label prepare-release
--base $GITHUB_REF_NAME
6 changes: 2 additions & 4 deletions .github/workflows/package-prepare-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,7 @@ jobs:
gh pr create --title "[$RELEASE_BRANCH_NAME] $message" \
--body "$message." \
--head $branch \
--base $RELEASE_BRANCH_NAME \
--label prepare-release
--base $RELEASE_BRANCH_NAME

create-pull-request-against-main:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -196,5 +195,4 @@ jobs:
gh pr create --title "$message" \
--body "$body" \
--head $branch \
--base main \
--label prepare-release
--base main
14 changes: 11 additions & 3 deletions .github/workflows/prepare-patch-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ jobs:
run: .github/scripts/use-cla-approved-github-bot.sh

- name: Create pull request
id: create_pr
env:
# not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows
GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
Expand All @@ -80,8 +81,15 @@ jobs:

git commit -a -m "$message"
git push origin HEAD:$branch
gh pr create --title "[$GITHUB_REF_NAME] $message" \
pr_url=$(gh pr create --title "[$GITHUB_REF_NAME] $message" \
--body "$message." \
--head $branch \
--base $GITHUB_REF_NAME \
--label prepare-release
--base $GITHUB_REF_NAME)
echo "pr_url=$pr_url" >> $GITHUB_OUTPUT

- name: Add prepare-release label to PR
if: steps.create_pr.outputs.pr_url != ''
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
gh pr edit ${{ steps.create_pr.outputs.pr_url }} --add-label "prepare-release"
28 changes: 22 additions & 6 deletions .github/workflows/prepare-release-branch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ jobs:
run: .github/scripts/use-cla-approved-github-bot.sh

- name: Create pull request against the release branch
id: create_release_branch_pr
env:
# not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows
GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
Expand All @@ -103,11 +104,18 @@ jobs:

git commit -a -m "$message"
git push origin HEAD:$branch
gh pr create --title "[$RELEASE_BRANCH_NAME] $message" \
pr_url=$(gh pr create --title "[$RELEASE_BRANCH_NAME] $message" \
--body "$message." \
--head $branch \
--base $RELEASE_BRANCH_NAME \
--label prepare-release
--base $RELEASE_BRANCH_NAME)
echo "pr_url=$pr_url" >> $GITHUB_OUTPUT

- name: Add prepare-release label to PR
if: steps.create_release_branch_pr.outputs.pr_url != ''
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
gh pr edit ${{ steps.create_release_branch_pr.outputs.pr_url }} --add-label "prepare-release"

create-pull-request-against-main:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -180,6 +188,7 @@ jobs:
run: .github/scripts/use-cla-approved-github-bot.sh

- name: Create pull request against main
id: create_main_pr
env:
# not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows
GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
Expand All @@ -190,8 +199,15 @@ jobs:

git commit -a -m "$message"
git push origin HEAD:$branch
gh pr create --title "$message" \
pr_url=$(gh pr create --title "$message" \
--body "$body" \
--head $branch \
--base main \
--label prepare-release
--base main)
echo "pr_url=$pr_url" >> $GITHUB_OUTPUT

- name: Add prepare-release label to PR
if: steps.create_main_pr.outputs.pr_url != ''
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
gh pr edit ${{ steps.create_main_pr.outputs.pr_url }} --add-label "prepare-release"