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

feat: upgrade to openresty-1.25.3.1 #83

Merged
merged 36 commits into from
Feb 21, 2024
Merged

feat: upgrade to openresty-1.25.3.1 #83

merged 36 commits into from
Feb 21, 2024

Conversation

zll600
Copy link
Contributor

@zll600 zll600 commented Jan 24, 2024

No description provided.

Copy link
Contributor Author

@zll600 zll600 left a comment

Choose a reason for hiding this comment

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

There are some problems when I update the patch files.

@zll600 zll600 marked this pull request as ready for review January 25, 2024 03:10
.github/workflows/ci.yml Outdated Show resolved Hide resolved

- name: Install
run: |
wget https://raw.githubusercontent.com/api7/apisix-build-tools/master/build-apisix-base.sh
wget https://raw.githubusercontent.com/zll600/apisix-build-tools/upgrade_openresty-1.25.3.1/build-apisix-base.sh
Copy link
Contributor

Choose a reason for hiding this comment

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

remember to revert this change

Choose a reason for hiding this comment

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

this project can not depend apisix-build-tools

apisix-build-tools base on apisix-nginx-module

@@ -210,6 +210,6 @@ exited
}
--- response_body
ok
--- shutdown_error_log
--- error_log
Copy link
Contributor

Choose a reason for hiding this comment

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

Why do you change this?
The --- shutdown_error_log section is used for checking the error logs generated during nginx exit.
The --- error_log to test normal error logs
I think they are for different purpose

Copy link
Contributor Author

@zll600 zll600 Feb 20, 2024

Choose a reason for hiding this comment

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

I found that log appears in error_log, but not in shutdown_error_log.

I also confirmed this by modifying the source code of test-nginx.

Choose a reason for hiding this comment

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

we need to merge this PR first.

this change seems acceptable

@monkeyDluffy6017 if you have different though, you can create new issue or PR to fix it

@monkeyDluffy6017 monkeyDluffy6017 changed the title chore: upgrade openresty-1.25.3.1 feat: upgrade to openresty-1.25.3.1 Feb 20, 2024
Copy link

@membphis membphis left a comment

Choose a reason for hiding this comment

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


- name: Install
run: |
wget https://raw.githubusercontent.com/api7/apisix-build-tools/master/build-apisix-base.sh
wget https://raw.githubusercontent.com/zll600/apisix-build-tools/upgrade_openresty-1.25.3.1/build-apisix-base.sh

Choose a reason for hiding this comment

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

this project can not depend apisix-build-tools

apisix-build-tools base on apisix-nginx-module

@@ -210,6 +210,6 @@ exited
}
--- response_body
ok
--- shutdown_error_log
--- error_log

Choose a reason for hiding this comment

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

we need to merge this PR first.

this change seems acceptable

@monkeyDluffy6017 if you have different though, you can create new issue or PR to fix it

@membphis membphis merged commit ed0dd94 into api7:main Feb 21, 2024
4 checks passed
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.

3 participants