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

[release-23.11] forgejo: 1.20.6-1-unstable-2024-02-22 -> 1.20.6-1-unstable-2024-04-18 #305156

Merged
merged 1 commit into from
Apr 19, 2024

Conversation

emilylange
Copy link
Member

Description of changes

This bump backports 1.21.11-0's security fixes to 1.20.6-1.

https://codeberg.org/forgejo/forgejo/pulls/3319

Please refer to the "Security fix" section in 1.21.11-0's release notes: https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1-21-11-0

Ref:

I also ran this version against our newer nixos-unstable VM test suite, which tests Forgejo Actions as well, using the following patch:

diff --git a/nixos/tests/forgejo.nix b/nixos/tests/forgejo.nix
index 8b9ee46ff5d3..bacaa7cb30bf 100644
--- a/nixos/tests/forgejo.nix
+++ b/nixos/tests/forgejo.nix
@@ -226,7 +226,7 @@ let
             def poll_workflow_action_status(_) -> bool:
                 output = server.succeed(
                     "curl --fail http://localhost:3000/test/repo/actions | "
-                    + 'htmlq ".flex-item-leading span" --attribute "data-tooltip-content"'
+                    + 'htmlq "span" --attribute "data-tooltip-content"'
                 ).strip()
 
                 # values taken from https://codeberg.org/forgejo/forgejo/src/commit/af47c583b4fb3190fa4c4c414500f9941cc02389/options/locale/locale_en-US.ini#L3649-L3661

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

This bump backports 1.21.11-0's security fixes to 1.20.6-1.

https://codeberg.org/forgejo/forgejo/pulls/3319

Please refer to the "Security fix" section in 1.21.11-0's release notes:
https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1-21-11-0
@adamcstephens adamcstephens merged commit e8aa3cf into NixOS:release-23.11 Apr 19, 2024
27 of 28 checks passed
@emilylange emilylange deleted the release-23.11-forgejo branch April 19, 2024 01:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants