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

caddy: 2.6.4 -> 2.7.2 #246859

Closed
wants to merge 1 commit into from
Closed

Conversation

techknowlogick
Copy link
Member

Diff: caddyserver/caddy@v2.6.4...v2.7.0

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.11 Release Notes (or backporting 23.05 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.

@emilylange
Copy link
Member

I'll mark this as draft until caddyserver/caddy#5671 is resolved and the fix released.
Thank you

@emilylange emilylange marked this pull request as draft August 2, 2023 22:21
@techknowlogick techknowlogick changed the title caddy: 2.6.4 -> 2.7.0 caddy: 2.6.4 -> 2.7.1 Aug 3, 2023
@techknowlogick
Copy link
Member Author

Thanks @emilylange :) I've just pushed the patched release of caddy.

@techknowlogick techknowlogick marked this pull request as ready for review August 3, 2023 01:29
@happysalada
Copy link
Contributor

ofborg seems to be failing with

 > (finished: must succeed: curl --fail -v 'http://localhost/example.html' 2>&1 | sed -n -e "s/^< [Ee][Tt][Aa][Gg]: *//p", in 0.05 seconds)
       > webserver: must succeed: curl --fail --silent --show-error -o /dev/null -w "%{http_code}" --head -H 'If-None-Match: ' http://localhost/example.html
       > (finished: must succeed: curl --fail --silent --show-error -o /dev/null -w "%{http_code}" --head -H 'If-None-Match: ' http://localhost/example.html, in 0.02 seconds)
       > Test "check ETag if serving Nix store paths" failed with error: "HTTP code is 200, expected 304"
       > cleanup
       > kill machine (pid 8)
       > webserver # qemu-kvm: terminating on signal 15 from pid 6 (/nix/store/jhflvwr40xbb0xr6jx4311icp9cym1fp-python3-3.10.12/bin/python3.10)
       > (finished: cleanup, in 0.02 seconds)
       > kill vlan (pid 7)
       For full logs, run 'nix log /nix/store/j2p46rvjq0xyx4cnid13qbggsvrv0smc-vm-test-run-caddy.drv'.

I'm not the one who wrote that test, I just saw this and thought outlining it might help.

@fin444
Copy link
Contributor

fin444 commented Aug 3, 2023

Caddy 2.7.2 has been released (diff)

Seems like 2.7 is having a bit of a rocky launch, may be best to hold off updating for a bit until it stabilizes.

@techknowlogick techknowlogick changed the title caddy: 2.6.4 -> 2.7.1 caddy: 2.6.4 -> 2.7.2 Aug 3, 2023
@emilylange
Copy link
Member

The VM test fails because Caddy no longer emits an etag for files with unix time 0 or 1, specifically implemented for nix environments.

See caddyserver/caddy#5550, caddyserver/caddy#5547 and #222354

I'd argue in favor of removing our etag subtest for now, and I'll try (no promises though) to reimplement it, including a test for the new etag override, some time in the future.

@happysalada
Copy link
Contributor

Happy to remove it for now.

@emilylange emilylange marked this pull request as draft August 4, 2023 19:46
@fin444
Copy link
Contributor

fin444 commented Aug 6, 2023

Caddy 2.7.3 has been released (diff)

@techknowlogick
Copy link
Member Author

Closing in favour of @emilylange's updated PR

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.

4 participants