Skip to content

Using Github App token to trigger CI for version increment PRs#2157

Merged
dblock merged 1 commit intoopensearch-project:mainfrom
VachaShah:use-github-app
Feb 17, 2022
Merged

Using Github App token to trigger CI for version increment PRs#2157
dblock merged 1 commit intoopensearch-project:mainfrom
VachaShah:use-github-app

Conversation

@VachaShah
Copy link
Copy Markdown
Contributor

Signed-off-by: Vacha Shah vachshah@amazon.com

Description

Using Github App token to trigger CI on PRs created for version increment from the version.yml workflow. (opensearch-project/common-utils#111 (comment))

Issues Resolved

[List any issues this PR will resolve]

Check List

  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Vacha Shah <vachshah@amazon.com>
@VachaShah VachaShah requested a review from a team as a code owner February 17, 2022 20:22
@opensearch-ci-bot
Copy link
Copy Markdown
Collaborator

Can one of the admins verify this patch?

@opensearch-ci-bot
Copy link
Copy Markdown
Collaborator

✅   Gradle Check success e8e16eb
Log 2516

Reports 2516

with:
app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.APP_PRIVATE_KEY }}
installation_id: 22958780
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we have any significance of this id?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Its the installation id of the opensearch-trigger-bot Github App.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it fine to expose it or should we add it in secrets?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Its fine. Its the same across all repos, we have been using it in backport and dependabot workflows.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good. Thanks for answering the questions.

@VachaShah VachaShah requested a review from dblock February 17, 2022 21:49
Copy link
Copy Markdown
Member

@owaiskazi19 owaiskazi19 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@dblock dblock merged commit 32a761d into opensearch-project:main Feb 17, 2022
@opensearch-trigger-bot
Copy link
Copy Markdown
Contributor

The backport to 1.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.x 1.x
# Navigate to the new working tree
cd .worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-2157-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 32a761df2ca117d24ed27a121195c4d8ef9ea1a0
# Push it to GitHub
git push --set-upstream origin backport/backport-2157-to-1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.x

Then, create a pull request where the base branch is 1.x and the compare/head branch is backport/backport-2157-to-1.x.

@opensearch-trigger-bot
Copy link
Copy Markdown
Contributor

The backport to 1.2 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.2 1.2
# Navigate to the new working tree
cd .worktrees/backport-1.2
# Create a new branch
git switch --create backport/backport-2157-to-1.2
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 32a761df2ca117d24ed27a121195c4d8ef9ea1a0
# Push it to GitHub
git push --set-upstream origin backport/backport-2157-to-1.2
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.2

Then, create a pull request where the base branch is 1.2 and the compare/head branch is backport/backport-2157-to-1.2.

@VachaShah
Copy link
Copy Markdown
Contributor Author

Looks like 1.x and 1.2 don't have the version.yml file. @dblock Do we want to backport it?

@dblock
Copy link
Copy Markdown
Member

dblock commented Feb 18, 2022

Looks like 1.x and 1.2 don't have the version.yml file. @dblock Do we want to backport it?

I think we should backport it to 1.x, or that workflow won't run when we branch and then release 1.3.0. Would you please do that? Thank you.

@VachaShah
Copy link
Copy Markdown
Contributor Author

Looks like 1.x and 1.2 don't have the version.yml file. @dblock Do we want to backport it?

I think we should backport it to 1.x, or that workflow won't run when we branch and then release 1.3.0. Would you please do that? Thank you.

Sure, I added a backport 1.x label to the original PR.

@opensearch-trigger-bot
Copy link
Copy Markdown
Contributor

The backport to 1.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.x 1.x
# Navigate to the new working tree
cd .worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-2157-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 32a761df2ca117d24ed27a121195c4d8ef9ea1a0
# Push it to GitHub
git push --set-upstream origin backport/backport-2157-to-1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.x

Then, create a pull request where the base branch is 1.x and the compare/head branch is backport/backport-2157-to-1.x.

1 similar comment
@opensearch-trigger-bot
Copy link
Copy Markdown
Contributor

The backport to 1.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.x 1.x
# Navigate to the new working tree
cd .worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-2157-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 32a761df2ca117d24ed27a121195c4d8ef9ea1a0
# Push it to GitHub
git push --set-upstream origin backport/backport-2157-to-1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.x

Then, create a pull request where the base branch is 1.x and the compare/head branch is backport/backport-2157-to-1.x.

@opensearch-trigger-bot
Copy link
Copy Markdown
Contributor

The backport to 1.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.x 1.x
# Navigate to the new working tree
cd .worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-2157-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 32a761df2ca117d24ed27a121195c4d8ef9ea1a0
# Push it to GitHub
git push --set-upstream origin backport/backport-2157-to-1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.x

Then, create a pull request where the base branch is 1.x and the compare/head branch is backport/backport-2157-to-1.x.

VachaShah added a commit to VachaShah/OpenSearch that referenced this pull request Mar 30, 2022
VachaShah added a commit to VachaShah/OpenSearch that referenced this pull request Mar 30, 2022
dblock pushed a commit that referenced this pull request Mar 31, 2022
* Using Github App token to trigger CI for version increment PRs (#2157)

Signed-off-by: Vacha Shah <vachshah@amazon.com>

* Fixing the indentation in version.yml (#2163)

Signed-off-by: Vacha Shah <vachshah@amazon.com>

* Adding signoff option for version workflow PR (#2572)

Signed-off-by: Vacha Shah <vachshah@amazon.com>
dblock pushed a commit that referenced this pull request Apr 5, 2022
* Using Github App token to trigger CI for version increment PRs (#2157)

Signed-off-by: Vacha Shah <vachshah@amazon.com>

* Fixing the indentation in version.yml (#2163)

Signed-off-by: Vacha Shah <vachshah@amazon.com>

* Adding signoff option for version workflow PR (#2572)

Signed-off-by: Vacha Shah <vachshah@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants