Skip to content

fix(ci): Use new default branch for activity app - #66762

Merged
DerDreschner merged 1 commit into
masterfrom
chore/fix-new-activity-branch
Nov 18, 2026
Merged

DerDreschner merged 1 commit into
masterfrom
chore/fix-new-activity-branch

Conversation

@DerDreschner

@DerDreschner DerDreschner commented Nov 18, 2026 •

Copy link
Copy Markdown
Member

Summary

The activity app changed their default branch from master to main. For that reason, the CI pipeline now fails as master doesn't exist anymore. This happened in https://github.com/nextcloud/server/actions/runs/44297759230/job/134823954223 for example.

Checking out the main repo instead now.

Checklist

AI (if applicable)

  • The content of this PR was partly or fully generated using AI

The activity app changed their default branch from master to main.
For that reason, the CI pipeline now fails as master doesn't exist
anymore.

Checking out the main repo instead now.

Signed-off-by: David Dreschner <david.dreschner@nextcloud.com>
@DerDreschner DerDreschner self-assigned this Nov 18, 2026
@DerDreschner
DerDreschner requested a review from a team as a code owner November 18, 2026 13:20
@DerDreschner DerDreschner added 3. to review Waiting for reviews CI labels Nov 18, 2026
@DerDreschner
DerDreschner requested review from CarlSchwan and icewind1991 and removed request for a team November 18, 2026 13:20
@DerDreschner
DerDreschner requested review from a team and come-nc November 18, 2026 13:22
@DerDreschner

Copy link
Copy Markdown
Member Author

/backport to stable35

@DerDreschner

Copy link
Copy Markdown
Member Author

/backport to stable34

@DerDreschner

Copy link
Copy Markdown
Member Author

/backport to stable33

@DerDreschner

Copy link
Copy Markdown
Member Author

/backport to stable32

@DerDreschner
DerDreschner merged commit 043c6e5 into master Nov 18, 2026
173 of 188 checks passed
@DerDreschner
DerDreschner deleted the chore/fix-new-activity-branch branch November 18, 2026 15:24
@backportbot

backportbot Bot commented Nov 18, 2026

Copy link
Copy Markdown

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

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

# Create the new backport branch
git checkout -b backport/66762/stable32

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 3b70e8bd

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/66762/stable32

Error: Failed to check for changes with origin/stable32: No changes found in backport branch


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@backportbot

backportbot Bot commented Nov 18, 2026

Copy link
Copy Markdown

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

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

# Create the new backport branch
git checkout -b backport/66762/stable33

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 3b70e8bd

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/66762/stable33

Error: Failed to check for changes with origin/stable33: No changes found in backport branch


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@backportbot

backportbot Bot commented Nov 18, 2026

Copy link
Copy Markdown

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

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

# Create the new backport branch
git checkout -b backport/66762/stable34

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 3b70e8bd

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/66762/stable34

Error: Failed to check for changes with origin/stable34: No changes found in backport branch


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@backportbot

backportbot Bot commented Nov 18, 2026

Copy link
Copy Markdown

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

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

# Create the new backport branch
git checkout -b backport/66762/stable35

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 3b70e8bd

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/66762/stable35

Error: Failed to check for changes with origin/stable35: No changes found in backport branch


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

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

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants