Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/run-major-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ jobs:
RELEASE_BRANCH: ${{ needs.prepare.outputs.release-branch }}
RELEASE_TYPE: ${{ needs.prepare.outputs.release-type }}
RELEASE_VERSION: ${{ needs.prepare.outputs.release-version }}
permissions:
contents: write
steps:

- uses: elastic/oblt-actions/slack/send@v1
Expand All @@ -70,6 +68,7 @@ jobs:
with:
# 0 indicates all history for all branches and tags.
fetch-depth: 0
token: ${{ steps.get_token.outputs.token }}

# Required to use a service account, otherwise PRs created by
# GitHub bot won't trigger any CI builds.
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/run-minor-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ jobs:
RELEASE_BRANCH: ${{ needs.prepare.outputs.release-branch }}
RELEASE_TYPE: ${{ needs.prepare.outputs.release-type }}
RELEASE_VERSION: ${{ needs.prepare.outputs.release-version }}
permissions:
contents: write
steps:

- uses: elastic/oblt-actions/slack/send@v1
Expand All @@ -70,6 +68,7 @@ jobs:
with:
# 0 indicates all history for all branches and tags.
fetch-depth: 0
token: ${{ steps.get_token.outputs.token }}

# Required to use a service account, otherwise PRs created by
# GitHub bot won't trigger any CI builds.
Expand Down
17 changes: 8 additions & 9 deletions .github/workflows/run-patch-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,7 @@ jobs:
RELEASE_BRANCH: ${{ needs.prepare.outputs.release-branch }}
RELEASE_TYPE: ${{ needs.prepare.outputs.release-type }}
RELEASE_VERSION: ${{ needs.prepare.outputs.release-version }}
permissions:
contents: write
steps:
- uses: actions/checkout@v5
with:
# 0 indicates all history for all branches and tags.
fetch-depth: 0
# Use the makefile in the given release branch.
ref: ${{ env.RELEASE_BRANCH }}

- name: Get token
id: get_token
uses: actions/create-github-app-token@v2
Expand All @@ -64,6 +55,14 @@ jobs:
permission-contents: write
permission-pull-requests: write

- uses: actions/checkout@v5
with:
# 0 indicates all history for all branches and tags.
fetch-depth: 0
# Use the makefile in the given release branch.
ref: ${{ env.RELEASE_BRANCH }}
token: ${{ steps.get_token.outputs.token }}

# Required to use a service account, otherwise PRs created by
# GitHub bot won't trigger any CI builds.
# See https://github.com/peter-evans/create-pull-request/issues/48#issuecomment-537478081
Expand Down
2 changes: 1 addition & 1 deletion release.mk
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ create-github-label:
create-pull-request: BRANCH=$${BRANCH} TITLE=$${TITLE} TARGET_BRANCH=$${TARGET_BRANCH} BODY=$${BODY} BACKPORT_LABEL=$${BACKPORT_LABEL}

create-pull-request:
@echo "::group::create-pull-request"
@echo "::group::create-pull-request $(BRANCH) -> $(TARGET_BRANCH)"
git push origin $(BRANCH)
echo "--label $(BACKPORT_LABEL)"
gh pr create \
Expand Down