Skip to content

Conversation

nickvergessen
Copy link
Member

@nickvergessen nickvergessen commented Feb 3, 2023

Should bring back green(er) CI on master:
#36508

Checklist

Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Copy link
Member Author

/backport to stable25

@nickvergessen
Copy link
Member Author

/backport to stable24

@nickvergessen nickvergessen added this to the Nextcloud 26 milestone Feb 3, 2023
@nickvergessen nickvergessen self-assigned this Feb 3, 2023
@nickvergessen nickvergessen added the 3. to review Waiting for reviews label Feb 3, 2023
@nickvergessen nickvergessen requested review from a team, ArtificialOwl, blizzz, come-nc and icewind1991 and removed request for a team February 3, 2023 09:04
Copy link
Member

@marcoambrosini marcoambrosini left a comment

Choose a reason for hiding this comment

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

🐘

@nickvergessen nickvergessen merged commit 7ddb042 into master Feb 3, 2023
@nickvergessen nickvergessen deleted the opt-out-of-phpunit-10 branch February 3, 2023 09:23
@backportbot-nextcloud
Copy link

The backport to stable25 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable25
git pull origin/stable25

# Create the new backport branch
git checkout -b fix/foo-stable25

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable25

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud
Copy link

The backport to stable24 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable24
git pull origin/stable24

# Create the new backport branch
git checkout -b fix/foo-stable24

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable24

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review Waiting for reviews

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants