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

Master is now 30 #44530

Merged
merged 5 commits into from
Mar 28, 2024
Merged

Master is now 30 #44530

merged 5 commits into from
Mar 28, 2024

Conversation

nickvergessen
Copy link
Member

@nickvergessen nickvergessen commented Mar 28, 2024

⚠️ To be merged only

  • After stable29 creation
  • By release manager: @skjnldsv

Todos

possible "up front"


"live"

  • .github/dependabot.yml
    • Add a new section about the new stableY branch
  • .github/workflows/update-cacert-bundle.yml
    • Adjust backport list of cacert automation to include stableY
  • `.github/workflows/update-code-signing-crl.yml
    • Adjust backport list of cacert automation to include stableY
  • .github/workflows/update-psalm-baseline.yml
    • Adjust backport list of psalm automation to include stableY
  • .github/workflows/npm-audit-fix.yml
    • Adjust backport list of psalm automation to include stableY
  • apps/settings/lib/WellKnown/SecurityTxtHandler.php
    • Bump Expires date to be 5 months in the future
    • Trigger the backport bot for all still supported versions
  • version.php
    • Increase the major version in $OC_Version and 0-ify the other digits
    • Set $OC_VersionString to Major.0.0 dev
    • Add the newest major to $OC_VersionCanBeUpgradedFrom
    • Remove the oldest major to $OC_VersionCanBeUpgradedFrom
  • apps/*/appinfo/info.xml
    • Update Minor version of all apps and 0ify the patch version
    • Bump version requirement to the new Major
  • Rebuilt frontend npm ci && npm run build
  • Fix other apps on stable branch:
  • Branch-off the stable29 branch in all affected apps, before sending this PR
  • fix: Also run dependabot for stable29 and github actions 3rdparty#1768

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

/backport b08563d to stable29

@nickvergessen
Copy link
Member Author

/backport b08563d to stable28

@nickvergessen
Copy link
Member Author

/backport b08563d to stable27

@nickvergessen nickvergessen merged commit 53d9e3f into master Mar 28, 2024
172 checks passed
@nickvergessen nickvergessen deleted the chore/master-is-now-30 branch March 28, 2024 11:03
Copy link

backportbot bot commented Mar 28, 2024

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

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

# Create the new backport branch
git checkout -b backport/44530/stable29

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

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

Error: Failed to push branch backport/44530/stable29: fatal: could not read Username for 'https://github.com': No such device or address


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

@nickvergessen
Copy link
Member Author

/backport b08563d to stable29

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants