Skip to content
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.

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

Automatically trigger desktop packages on releases #630

Merged
merged 9 commits into from
Aug 4, 2023

Conversation

t3chguy
Copy link
Member

@t3chguy t3chguy commented Apr 17, 2023


This change is marked as an internal change (Task), so will not be included in the changelog.

@t3chguy t3chguy added the T-Task Tasks for the team like planning label Apr 17, 2023
@t3chguy t3chguy requested a review from andybalaam April 17, 2023 08:37
@t3chguy t3chguy requested a review from a team as a code owner April 17, 2023 08:37
@t3chguy t3chguy self-assigned this Apr 17, 2023
… t3chguy/package-on-release

# Conflicts:
#	.github/workflows/build_and_deploy.yaml
…into t3chguy/package-on-release

# Conflicts:
#	.github/workflows/build_and_deploy.yaml
#	.github/workflows/build_prepare.yaml
@t3chguy t3chguy marked this pull request as draft August 3, 2023 15:36
@t3chguy t3chguy marked this pull request as ready for review August 4, 2023 07:50
@t3chguy t3chguy merged commit 1929351 into develop Aug 4, 2023
24 checks passed
@t3chguy t3chguy deleted the t3chguy/package-on-release branch August 4, 2023 08:12
@t3chguy t3chguy added the backport staging Label to automatically backport PR to staging branch label Aug 4, 2023
@RiotRobot
Copy link
Contributor

The backport to staging 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-staging staging
# Navigate to the new working tree
cd .worktrees/backport-staging
# Create a new branch
git switch --create backport-630-to-staging
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 1929351e9129e75c18b730e919d71455fae14ae3
# Push it to GitHub
git push --set-upstream origin backport-630-to-staging
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-staging

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport staging Label to automatically backport PR to staging branch T-Task Tasks for the team like planning
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants