Going from 34 to 35 #140

New Issue

Closed

opened 2026-10-13 20:00:04 +00:00 by ineiti · 3 comments

ineiti commented 2026-10-13 20:00:04 +00:00

Owner

Copy Link

Copy Source

"Oups, I did it again, I didn't follow MAINTENANCE.md and now it's a mess"

We discussed in #137 that I didn't follow MAINTENANCE.md wrt the release of v34: instead of first releasing the "rolling version" of 33, I started with releasing the new version 34. And now the problem is that it's very difficult to add the rolling version of 33 after, even though 34 is not abra recipe released yet. Instead of trying to fix this with force push and/or branches, I propose the following:

1. abra recipe release of 15.2.0-34.0.2, instead of 15.0.0-34.0.2 because of my earlier mishaps with pushing a 15.1.0 tag, see #112
2. creating a "rolling" release 15.3.0-34 - not sure if it can be named like that because of the missing minor and patch version
3. creating a PR for a major update to 16.0.0-35.0.1, and release it once it has been tested by two maintainers

@moritz @dannygroenewegen - does that sound OK to you?

"Oups, I did it again, I didn't follow MAINTENANCE.md and now it's a mess" We discussed in #137 that I didn't follow `MAINTENANCE.md` wrt the release of v34: instead of _first_ releasing the "rolling version" of 33, I started with releasing the new version 34. And now the problem is that it's very difficult to add the rolling version of 33 _after_, even though 34 is not `abra recipe release`d yet. Instead of trying to fix this with force push and/or branches, I propose the following: 1. `abra recipe release` of `15.2.0-34.0.2`, instead of `15.0.0-34.0.2` because of my earlier mishaps with pushing a 15.1.0 tag, see #112 2. creating a "rolling" release `15.3.0-34` - not sure if it can be named like that because of the missing minor and patch version 3. creating a PR for a major update to `16.0.0-35.0.1`, and release it once it has been tested by two maintainers @moritz @dannygroenewegen - does that sound OK to you?

ineiti self-assigned this 2026-10-13 20:00:12 +00:00

ineiti referenced this issue 2026-10-13 20:01:01 +00:00

WIP: pr-14.2.0 - Rolling release for nextcloud 33 #108

moritz commented 2026-10-13 21:40:45 +00:00

Owner

Copy Link

Copy Source

Sorry I'm a bit confused. I think I still don't really understand what's your plan now. Before we're going from 34 to 35 we need to go from 33 to 34.

abra recipe release of 15.2.0-34.0.2, instead of 15.0.0-34.0.2 because of my earlier mishaps with pushing a 15.1.0 tag, see #112

There is no 15.x.y tag: https://git.coopcloud.tech/coop-cloud/nextcloud/tags

I would propose the following:

1. Revert 9d25f7ee3c
2. Change all nextcloud images to image: nextcloud:33-fpm and commit it
3. publish the release 14.6.0+33-fpm
4. Cherry-Pick 9d25f7ee3c
5. Publish the next major release 15.0.0+34.0.4-fpm

Sorry I'm a bit confused. I think I still don't really understand what's your plan now. Before we're going from 34 to 35 we need to go from 33 to 34. > abra recipe release of 15.2.0-34.0.2, instead of 15.0.0-34.0.2 because of my earlier mishaps with pushing a 15.1.0 tag, see [#112](https://git.coopcloud.tech/coop-cloud/nextcloud/issues/112) There is no `15.x.y` tag: https://git.coopcloud.tech/coop-cloud/nextcloud/tags I would propose the following: 1. Revert https://git.coopcloud.tech/coop-cloud/nextcloud/commit/9d25f7ee3c5f23e4fcf7b4b603bd48a7b5207425 1. Change all nextcloud images to `image: nextcloud:33-fpm` and commit it 2. publish the release `14.6.0+33-fpm` 3. Cherry-Pick https://git.coopcloud.tech/coop-cloud/nextcloud/commit/9d25f7ee3c5f23e4fcf7b4b603bd48a7b5207425 4. Publish the next major release `15.0.0+34.0.4-fpm`

dannygroenewegen commented 2026-10-14 13:17:24 +00:00

Owner

Copy Link

Copy Source

I would propose the following:

1. Revert 9d25f7ee3c
2. Change all nextcloud images to image: nextcloud:33-fpm and commit it
3. publish the release 14.6.0+33-fpm
4. Cherry-Pick 9d25f7ee3c
5. Publish the next major release 15.0.0+34.0.4-fpm

Agree with this plan. I can probably do that this week, but if anyone else is earlier, that's also ok.

For context about the confusion, see #104 (comment). About two months ago, ineiti made a branch for a PR that already included the annotated tag for 15.x. This tag was added to the recipe catalogue, but abra appeared to only pick that up with abra app new and not on upgrades of existing deployments. So there were a couple of days where someone could have made a new deployment based on a version tag from a PR branch (while the main branch was still at 13.x). We decided to remove the 15.x tags from the branch PR. If someone deployed that, their local repo still kept the 15.x tags and abra simply doesn't see an upgrade until the main branch catches up to 15.x. Back then we thought about skipping the 15.0 and 15.1 tags on the main branch, but by now nextcloud is at 34.0.4 instead of 34.0.1 that was in the faulty branch. So there won't be a duplicate tag conflict anymore for anyone who still has the removed 15.x tag in their local repo.

> I would propose the following: > > 1. Revert https://git.coopcloud.tech/coop-cloud/nextcloud/commit/9d25f7ee3c5f23e4fcf7b4b603bd48a7b5207425 > 1. Change all nextcloud images to `image: nextcloud:33-fpm` and commit it > 2. publish the release `14.6.0+33-fpm` > 3. Cherry-Pick https://git.coopcloud.tech/coop-cloud/nextcloud/commit/9d25f7ee3c5f23e4fcf7b4b603bd48a7b5207425 > 4. Publish the next major release `15.0.0+34.0.4-fpm` Agree with this plan. I can probably do that this week, but if anyone else is earlier, that's also ok. For context about the confusion, see https://git.coopcloud.tech/coop-cloud/nextcloud/issues/104#issuecomment-37973. About two months ago, ineiti made a branch for a PR that already included the annotated tag for 15.x. This tag was added to the recipe catalogue, but abra appeared to only pick that up with `abra app new` and not on upgrades of existing deployments. So there were a couple of days where someone could have made a new deployment based on a version tag from a PR branch (while the main branch was still at 13.x). We decided to remove the 15.x tags from the branch PR. If someone deployed that, their local repo still kept the 15.x tags and abra simply doesn't see an upgrade until the main branch catches up to 15.x. Back then we thought about skipping the 15.0 and 15.1 tags on the main branch, but by now nextcloud is at 34.0.4 instead of 34.0.1 that was in the faulty branch. So there won't be a duplicate tag conflict anymore for anyone who still has the removed 15.x tag in their local repo.

ineiti commented 2026-10-17 12:10:36 +00:00

Author

Owner

Copy Link

Copy Source

Here you go: #143

Here you go: #143

👍 1

dannygroenewegen closed this issue 2026-10-18 10:34:13 +00:00

Sign in to join this conversation.

No Branch/Tag Specified

Branches Tags

main

renovate/ghcr.io-nextcloud-releases-whiteboard-2.x

version_35

after-pr-143-cherry-pick

pr-143-review

kc_stable

renovate/docker.elastic.co-elasticsearch-elasticsearch-9.x

pr-125-v2

pr-125

renovate/mariadb-13.x

trusted-domains

renovate/pgautoupgrade-pgautoupgrade-18.x

pr-15.2.0+34.0.2-fpm

pr-14.2.0+33-fpm

fix-pgautoupgrade-max-connections

upload-limit

feature/imaginary

15.0.0+34.0.5-fpm

14.6.0+33-fpm

14.5.1+33.0.9-fpm

14.5.0+33.0.9-fpm

14.4.0+33.0.9-fpm

14.3.0+33.0.9-fpm

14.2.0+33.0.9-fpm

14.1.2+33.0.9-fpm

14.1.1+33.0.8-fpm

14.1.0+33.0.7-fpm

14.0.1+33.0.7-fpm

14.0.0+33.0.7-fpm

13.2.0+32-fpm

13.1.5+32.0.13-fpm

13.1.4+32.0.13-fpm

13.1.3+32.0.13-fpm

13.1.2+32.0.13-fpm

13.1.1+32.0.12-fpm

13.1.0+32.0.11-fpm

13.0.1+32.0.3-fpm

13.0.0+32.0.3-fpm

12.1.0+31.0.6-fpm

12.0.1+31.0.6-fpm

12.0.0+31.0.6-fpm

11.4.0+30.0.6-fpm

11.4.0+30.0.10-fpm

11.3.0+30.0.6-fpm

11.2.0+30.0.6-fpm

11.1.0+30.0.6-fpm

11.0.1+30.0.4-fpm

11.0.0+30.0.4-fpm

10.0.0+30.0.4-fpm

9.2.0+29.0.8-fpm

6.0.11+28.0.10-fpm

6.0.10+28.0.10-fpm

6.0.9+28.0.10-fpm

9.1.2+29.0.5-fpm

6.0.8+28.0.5-fpm

6.0.7+28.0.5-fpm

9.1.0+29.0.5-fpm

9.0.0+29.0.5-fpm

6.0.6+28.0.5-fpm

8.0.1+29.0.3-fpm

8.0.0+29.0.1-fpm

7.0.3+29.0.1-fpm

6.0.5+28.0.5-fpm

7.0.2+29.0.1-fpm

7.0.1+29.0.1-fpm

7.0.0+29.0.0-fpm

6.0.4+28.0.5-fpm

6.0.3+28.0.5-fpm

6.0.2+28.0.5-fpm

5.0.3+27.0.1-fpm

6.0.1+28.0.2-fpm

6.0.0+28.0.1-fpm

5.2.0+27.1.5-fpm

5.1.1+27.1.5-fpm

5.1.0+27.1.3-fpm

5.0.2+27.0.1-fpm

5.0.1+27.0.1-fpm

5.0.0+27.0.0-fpm

4.0.7+26.0.2-fpm

4.0.6+26.0.2-fpm

4.0.5+26.0.2-fpm

4.0.4+26.0.2-fpm

4.0.3+26.0.2-fpm

4.0.2+26.0.2-fpm

4.0.1+26.0.1-fpm

4.0.0+26.0.1-fpm

3.3.2+25.0.6-fpm

3.3.1+25.0.5-fpm

3.3.0+25.0.5-fpm

3.2.0+25.0.4-fpm

3.1.2+25.0.4-fpm

3.1.1+25.0.1-fpm

3.1.0+25.0.1-fpm

3.0.1+25.0.1-fpm

3.0.0+25.0.1-fpm

2.1.4+24.0.6-fpm

2.1.3+24.0.5-fpm

2.1.2+24.0.3-fpm

2.1.1+24.0.2-fpm

2.1.0+24.0.0-fpm

2.0.0+23.0.4-fpm

1.0.0+23.0.1-fpm

Labels

Clear labels

bug

Something is not working

documentation

For issues that are calling out documentation gap

duplicate

This issue or pull request already exists

enhancement

New feature

help wanted

Need some help

invalid

Something is wrong

question

More information is needed

wontfix

This won't be fixed

No labels

Milestone

No items

No Milestone

Assignees

Clear assignees

3wordchant aadil (Aadil Ayub) abra-bot (Abra Bot) ammaratef45 amras (Sarma) BornDeleuze (Born Deleuze) Brooke carla cas (Cassowary) coopcloud dannygroenewegen (Danny Groenewegen) decentral1se (d1) fauno (fauno) ineiti (Linus Gasser) javielico (Javielico) jjsfunhouse kawaiipunk (KawaiiPunk) knoflook moosemower moritz notplants oxaliq (sorrel) p4u1 (p4u1) renovate-bot (Comrade Renovate Bot) simon stevensting (stevensting) trav (Trav Fryer) yksflip

No Assignees ineiti

3 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: coop-cloud/nextcloud#140