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

1.33.0 Release Preparations #1401

Merged
merged 4 commits into from
Sep 17, 2024
Merged

1.33.0 Release Preparations #1401

merged 4 commits into from
Sep 17, 2024

Conversation

ac000
Copy link
Member

@ac000 ac000 commented Aug 22, 2024

This is a preparatory branch for the 1.33.0 release.

@ac000

This comment was marked as outdated.

@ac000

This comment was marked as outdated.

@ac000 ac000 marked this pull request as ready for review September 10, 2024 20:17
@avahahn avahahn self-requested a review September 10, 2024 21:39
@Jcahilltorre
Copy link
Contributor

Jcahilltorre commented Sep 12, 2024

Wondering, if this has to be merged when 1.33 releases, we can change the target branch to release-1.33 and merge it now. We will merge that branch to main at GA

@ac000
Copy link
Member Author

ac000 commented Sep 12, 2024

Wondering, if this has to be merged when 1.33 releases, we can change the target branch to release-1.33 and merge it now. We will merge that branch to main at GA

This is for the unit repository...

@Jcahilltorre
Copy link
Contributor

commented on the wrong PR, ignore

@ac000
Copy link
Member Author

ac000 commented Sep 16, 2024

Add the unitctl 1.33.0 version update

Copy link
Member

@thresheek thresheek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think Dockerfile updates need to remove and add few files - e.g. per Makefile we need to ship go 1.22 and 1.23, and new slim python variants too.

Probably something like cd pkg/docker; make clean; make dockerfiles should suffice in generating what's current. Then, git rm/git add.

@ac000
Copy link
Member Author

ac000 commented Sep 16, 2024

Thanks @thresheek done!

@ac000
Copy link
Member Author

ac000 commented Sep 16, 2024

$ git show --stat 5a647cd783f6bef7bb2769c914af55ae47d32f12
commit 5a647cd783f6bef7bb2769c914af55ae47d32f12
Author: Andrew Clayton <a.clayton@nginx.com>
Date:   Mon Sep 16 22:29:32 2024 +0100

    pkg/docker: Update dockerfiles
    
    Signed-off-by: Andrew Clayton <a.clayton@nginx.com>

 pkg/docker/Dockerfile.go1.21                            |  2 +-
 pkg/docker/Dockerfile.go1.22                            |  2 +-
 pkg/docker/Dockerfile.minimal                           |  2 +-
 pkg/docker/Dockerfile.node20                            |  2 +-
 pkg/docker/{Dockerfile.node21 => Dockerfile.node22}     |  4 ++--
 pkg/docker/Dockerfile.perl5.38                          |  2 +-
 pkg/docker/{Dockerfile.perl5.36 => Dockerfile.perl5.40} |  4 ++--
 pkg/docker/Dockerfile.php8.2                            |  2 +-
 pkg/docker/Dockerfile.php8.3                            |  2 +-
 pkg/docker/Dockerfile.python3.11                        |  2 +-
 pkg/docker/Dockerfile.python3.12                        |  2 +-
 pkg/docker/Dockerfile.ruby3.2                           |  2 +-
 pkg/docker/Dockerfile.ruby3.3                           |  2 +-
 pkg/docker/Dockerfile.wasm                              | 10 +++++-----
 14 files changed, 20 insertions(+), 20 deletions(-)

@ac000
Copy link
Member Author

ac000 commented Sep 16, 2024

  • Rebased with master
  • Re-generated dockerfiles (this made the dockerfile version changes commit go-away...)
it show --stat 0f945165af5a933f6b2c62989249faec4a9cef52
commit 0f945165af5a933f6b2c62989249faec4a9cef52
Author: Andrew Clayton <a.clayton@nginx.com>
Date:   Mon Sep 16 22:29:32 2024 +0100

    pkg/docker: Update dockerfiles
    
    Signed-off-by: Andrew Clayton <a.clayton@nginx.com>

 pkg/docker/Dockerfile.go1.22                       |  6 +-
 .../{Dockerfile.go1.21 => Dockerfile.go1.23}       |  8 +-
 pkg/docker/Dockerfile.jsc11                        |  4 +-
 pkg/docker/Dockerfile.minimal                      |  6 +-
 pkg/docker/Dockerfile.node20                       |  6 +-
 .../{Dockerfile.node21 => Dockerfile.node22}       |  8 +-
 pkg/docker/Dockerfile.perl5.38                     |  6 +-
 .../{Dockerfile.perl5.36 => Dockerfile.perl5.40}   |  8 +-
 pkg/docker/Dockerfile.php8.2                       |  6 +-
 pkg/docker/Dockerfile.php8.3                       |  6 +-
 pkg/docker/Dockerfile.python3.11                   |  6 +-
 pkg/docker/Dockerfile.python3.11-slim              | 89 ++++++++++++++++++++++
 pkg/docker/Dockerfile.python3.12                   |  6 +-
 pkg/docker/Dockerfile.python3.12-slim              | 89 ++++++++++++++++++++++
 pkg/docker/Dockerfile.ruby3.2                      |  6 +-
 pkg/docker/Dockerfile.ruby3.3                      |  6 +-
 pkg/docker/Dockerfile.wasm                         | 14 ++--
 17 files changed, 229 insertions(+), 51 deletions(-)

Copy link
Member

@thresheek thresheek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, LGTM from Docker POV now.

Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
@ac000
Copy link
Member Author

ac000 commented Sep 17, 2024

Rebased with master.

This is autogenerated from docs/changes.xml by

  $ make -C docs/ changes && mv build/CHANGES .

Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
@ac000
Copy link
Member Author

ac000 commented Sep 17, 2024

Final build of CHANGES

@ac000 ac000 merged commit 24ed91f into nginx:master Sep 17, 2024
8 checks passed
@ac000 ac000 deleted the 1.33-prep branch September 17, 2024 13:26
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.

4 participants