Skip to content
Merged
Show file tree
Hide file tree
Changes from 49 commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
8807bf0
upgrade: ubuntu to latest version in CI
Revolyssup Feb 12, 2025
0ec0c77
use java8 for dubbo
Revolyssup Feb 12, 2025
d05c466
fix uri blocker test
Revolyssup Feb 12, 2025
8ceadeb
remove flag
Revolyssup Feb 12, 2025
d35cbb7
change file ownership
Revolyssup Feb 12, 2025
a6615f3
fix CI
Revolyssup Feb 12, 2025
8161b79
fix lint
Revolyssup Feb 12, 2025
18b04d0
fix cli
Revolyssup Feb 12, 2025
605da6f
try with 000 umask
Revolyssup Feb 12, 2025
9c2c81b
fix test_access
Revolyssup Feb 12, 2025
ba00a71
give full permission
Revolyssup Feb 12, 2025
b73e600
try again
Revolyssup Feb 12, 2025
8f65991
try again
Revolyssup Feb 12, 2025
8a16f52
run make init
Revolyssup Feb 14, 2025
4d40fd6
fix lint
Revolyssup Feb 14, 2025
f1477e4
comment one test
Revolyssup Feb 14, 2025
2024730
add permission for https_admin:true test in access_log
Revolyssup Feb 14, 2025
a39dbd9
try cli test with ubuntu 24.04
Revolyssup Feb 17, 2025
cf6d486
set permission explicitly
Revolyssup Feb 17, 2025
0f71f01
reset version
Revolyssup Feb 17, 2025
97db648
run worker as root
Revolyssup Feb 17, 2025
524bd14
use ip instead of localhost
Revolyssup Feb 17, 2025
5c15dd0
set umask and also add tmate
Revolyssup Feb 17, 2025
516007c
trigger cli
Revolyssup Feb 17, 2025
05f23af
disable other wwf
Revolyssup Feb 17, 2025
138c95a
remove tmate
Revolyssup Feb 17, 2025
a62f431
setup tmate
Revolyssup Feb 17, 2025
fbb94f3
remove conf
Revolyssup Feb 17, 2025
47e9dd9
remove timeout
Revolyssup Feb 17, 2025
48c2099
run one cli ci
Revolyssup Feb 17, 2025
32b706a
dont use matrix
Revolyssup Feb 17, 2025
551c7e7
run on fail only
Revolyssup Feb 17, 2025
c31f750
run on fail only
Revolyssup Feb 17, 2025
c667743
run
Revolyssup Feb 17, 2025
d2aeaeb
run
Revolyssup Feb 17, 2025
a506c34
run
Revolyssup Feb 17, 2025
8f3c2d8
add back test_access_log
Revolyssup Feb 17, 2025
813ad8e
add more permission fixes
Revolyssup Feb 17, 2025
165a0a5
remove failing test
Revolyssup Feb 17, 2025
57ef9ef
try
Revolyssup Feb 17, 2025
90cf37c
add wait
Revolyssup Feb 17, 2025
f1dd489
add sleep
Revolyssup Feb 17, 2025
fbd9446
add execute on home directory
Revolyssup Feb 17, 2025
011038c
remove sudo
Revolyssup Feb 17, 2025
5f1cc54
remove preserve env
Revolyssup Feb 17, 2025
d5c80a9
revert
Revolyssup Feb 17, 2025
383a626
apply suggestion
Revolyssup Feb 18, 2025
6edee05
reset tests
Revolyssup Feb 18, 2025
d93e1ec
fix all CI
Revolyssup Feb 18, 2025
401c2bd
apply suggestions
Revolyssup Feb 19, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
fail-fast: false
matrix:
platform:
- ubuntu-20.04
- ubuntu-latest
os_name:
- linux_openresty
events_module:
Expand Down Expand Up @@ -143,15 +143,22 @@ jobs:
run: |
cur_dir=$(pwd)
sudo apt update
sudo apt install -y maven
sudo apt install -y maven openjdk-8-jdk
sudo update-java-alternatives --set java-1.8.0-openjdk-amd64
export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
export PATH=$JAVA_HOME/bin:$PATH
cd t/lib/dubbo-backend
mvn package
cd dubbo-backend-provider/target
java -Djava.net.preferIPv4Stack=true -jar dubbo-demo-provider.one-jar.jar > /tmp/java.log &
java \
-Djava.net.preferIPv4Stack=true \
-jar dubbo-demo-provider.one-jar.jar > /tmp/java.log &
cd $cur_dir/t/lib/dubbo-serialization-backend
mvn package
cd dubbo-serialization-backend-provider/target
java -Djava.net.preferIPv4Stack=true -jar dubbo-demo-provider.one-jar.jar > /tmp/java2.log &
java \
-Djava.net.preferIPv4Stack=true \
-jar dubbo-demo-provider.one-jar.jar > /tmp/java2.log &

- name: Build xDS library
if: steps.test_env.outputs.type == 'last'
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
runs-on: ${{ matrix.platform }}
timeout-minutes: 30
env:
SERVER_NAME: ${{ matrix.job_name }}
SERVER_NAME: linux_apisix_current_luarocks
OPENRESTY_VERSION: default

steps:
Expand Down Expand Up @@ -63,4 +63,6 @@ jobs:
./ci/${{ matrix.job_name }}_runner.sh do_install

- name: Linux Script
run: sudo ./ci/${{ matrix.job_name }}_runner.sh script
run: |
sudo chmod +x /home/runner
sudo sh -c 'umask 022 && ./ci/${{ matrix.job_name }}_runner.sh script'
15 changes: 11 additions & 4 deletions .github/workflows/gm-cron.yaml.disabled
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
fail-fast: false
matrix:
platform:
- ubuntu-20.04
- ubuntu-latest
os_name:
- linux_openresty_tongsuo
test_dir:
Expand Down Expand Up @@ -126,15 +126,22 @@ jobs:
run: |
cur_dir=$(pwd)
sudo apt update
sudo apt install -y maven
sudo apt install -y maven openjdk-8-jdk
sudo update-java-alternatives --set java-1.8.0-openjdk-amd64
export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
export PATH=$JAVA_HOME/bin:$PATH
cd t/lib/dubbo-backend
mvn package
cd dubbo-backend-provider/target
java -Djava.net.preferIPv4Stack=true -jar dubbo-demo-provider.one-jar.jar > /tmp/java.log &
java \
-Djava.net.preferIPv4Stack=true \
-jar dubbo-demo-provider.one-jar.jar > /tmp/java.log &
cd $cur_dir/t/lib/dubbo-serialization-backend
mvn package
cd dubbo-serialization-backend-provider/target
java -Djava.net.preferIPv4Stack=true -jar dubbo-demo-provider.one-jar.jar > /tmp/java2.log &
java \
-Djava.net.preferIPv4Stack=true \
-jar dubbo-demo-provider.one-jar.jar > /tmp/java2.log &

- name: Build xDS library
if: steps.test_env.outputs.type == 'last'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gm.yml.disabled
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
fail-fast: false
matrix:
platform:
- ubuntu-20.04
- ubuntu-latest
os_name:
- linux_openresty_tongsuo
test_dir:
Expand Down
15 changes: 11 additions & 4 deletions .github/workflows/http3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
fail-fast: false
matrix:
platform:
- ubuntu-20.04
- ubuntu-latest
os_name:
- linux_openresty
events_module:
Expand Down Expand Up @@ -144,15 +144,22 @@ jobs:
run: |
cur_dir=$(pwd)
sudo apt update
sudo apt install -y maven
sudo apt install -y maven openjdk-8-jdk
sudo update-java-alternatives --set java-1.8.0-openjdk-amd64
export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
export PATH=$JAVA_HOME/bin:$PATH
cd t/lib/dubbo-backend
mvn package
cd dubbo-backend-provider/target
java -Djava.net.preferIPv4Stack=true -jar dubbo-demo-provider.one-jar.jar > /tmp/java.log &
java \
-Djava.net.preferIPv4Stack=true \
-jar dubbo-demo-provider.one-jar.jar > /tmp/java.log &
cd $cur_dir/t/lib/dubbo-serialization-backend
mvn package
cd dubbo-serialization-backend-provider/target
java -Djava.net.preferIPv4Stack=true -jar dubbo-demo-provider.one-jar.jar > /tmp/java2.log &
java \
-Djava.net.preferIPv4Stack=true \
-jar dubbo-demo-provider.one-jar.jar > /tmp/java2.log &

- name: Build xDS library
if: steps.test_env.outputs.type == 'last'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/kubernetes-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
fail-fast: false
matrix:
platform:
- ubuntu-20.04
- ubuntu-latest
os_name:
- linux_openresty

Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/redhat-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ permissions:
jobs:
test_apisix:
name: run ci on redhat ubi
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
timeout-minutes: 90
strategy:
fail-fast: false
Expand Down Expand Up @@ -101,11 +101,15 @@ jobs:
cd t/lib/dubbo-backend
mvn package
cd dubbo-backend-provider/target
java -Djava.net.preferIPv4Stack=true -jar dubbo-demo-provider.one-jar.jar > /tmp/java.log &
java \
-Djava.net.preferIPv4Stack=true \
-jar dubbo-demo-provider.one-jar.jar > /tmp/java.log &
cd $cur_dir/t/lib/dubbo-serialization-backend
mvn package
cd dubbo-serialization-backend-provider/target
java -Djava.net.preferIPv4Stack=true -jar dubbo-demo-provider.one-jar.jar > /tmp/java2.log &
java \
-Djava.net.preferIPv4Stack=true \
-jar dubbo-demo-provider.one-jar.jar > /tmp/java2.log &

- name: Build xDS library
if: steps.test_env.outputs.type == 'last'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/source-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
fail-fast: false
matrix:
platform:
- ubuntu-20.04
- ubuntu-latest
os_platform:
- ubuntu
- redhat
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tars-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
fail-fast: false
matrix:
platform:
- ubuntu-20.04
- ubuntu-latest
os_name:
- linux_openresty

Expand Down
4 changes: 2 additions & 2 deletions t/plugin/uri-blocker.t
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ location /t {
GET /t
--- error_code: 400
--- response_body
{"error_msg":"failed to check the configuration of plugin uri-blocker err: pcre2_compile() failed: missing closing parenthesis in \".+(\""}
{"error_msg":"failed to check the configuration of plugin uri-blocker err: pcre_compile() failed: missing ) in \".+(\""}



Expand Down Expand Up @@ -112,7 +112,7 @@ location /t {
GET /t
--- error_code: 400
--- response_body
{"error_msg":"failed to check the configuration of plugin uri-blocker err: pcre2_compile() failed: missing closing parenthesis in \"^b(\""}
{"error_msg":"failed to check the configuration of plugin uri-blocker err: pcre_compile() failed: missing ) in \"^b(\""}



Expand Down
Loading