File tree Expand file tree Collapse file tree 10 files changed +49
-22
lines changed
Expand file tree Collapse file tree 10 files changed +49
-22
lines changed Original file line number Diff line number Diff line change 2525 fail-fast : false
2626 matrix :
2727 platform :
28- - ubuntu-20.04
28+ - ubuntu-latest
2929 os_name :
3030 - linux_openresty
3131 events_module :
@@ -143,15 +143,22 @@ jobs:
143143 run : |
144144 cur_dir=$(pwd)
145145 sudo apt update
146- sudo apt install -y maven
146+ sudo apt install -y maven openjdk-8-jdk
147+ sudo update-java-alternatives --set java-1.8.0-openjdk-amd64
148+ export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
149+ export PATH=$JAVA_HOME/bin:$PATH
147150 cd t/lib/dubbo-backend
148151 mvn package
149152 cd dubbo-backend-provider/target
150- java -Djava.net.preferIPv4Stack=true -jar dubbo-demo-provider.one-jar.jar > /tmp/java.log &
153+ java \
154+ -Djava.net.preferIPv4Stack=true \
155+ -jar dubbo-demo-provider.one-jar.jar > /tmp/java.log &
151156 cd $cur_dir/t/lib/dubbo-serialization-backend
152157 mvn package
153158 cd dubbo-serialization-backend-provider/target
154- java -Djava.net.preferIPv4Stack=true -jar dubbo-demo-provider.one-jar.jar > /tmp/java2.log &
159+ java \
160+ -Djava.net.preferIPv4Stack=true \
161+ -jar dubbo-demo-provider.one-jar.jar > /tmp/java2.log &
155162
156163 - name : Build xDS library
157164 if : steps.test_env.outputs.type == 'last'
Original file line number Diff line number Diff line change 6363 ./ci/${{ matrix.job_name }}_runner.sh do_install
6464
6565 - name : Linux Script
66- run : sudo ./ci/${{ matrix.job_name }}_runner.sh script
66+ run : |
67+ sudo chmod +x /home/runner
68+ sudo ./ci/${{ matrix.job_name }}_runner.sh script
Original file line number Diff line number Diff line change 1414 fail-fast: false
1515 matrix:
1616 platform:
17- - ubuntu-20.04
17+ - ubuntu-latest
1818 os_name:
1919 - linux_openresty_tongsuo
2020 test_dir:
@@ -126,15 +126,22 @@ jobs:
126126 run: |
127127 cur_dir=$(pwd)
128128 sudo apt update
129- sudo apt install -y maven
129+ sudo apt install -y maven openjdk-8-jdk
130+ sudo update-java-alternatives --set java-1.8.0-openjdk-amd64
131+ export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
132+ export PATH=$JAVA_HOME/bin:$PATH
130133 cd t/lib/dubbo-backend
131134 mvn package
132135 cd dubbo-backend-provider/target
133- java -Djava.net.preferIPv4Stack=true -jar dubbo-demo-provider.one-jar.jar > /tmp/java.log &
136+ java \
137+ -Djava.net.preferIPv4Stack=true \
138+ -jar dubbo-demo-provider.one-jar.jar > /tmp/java.log &
134139 cd $cur_dir/t/lib/dubbo-serialization-backend
135140 mvn package
136141 cd dubbo-serialization-backend-provider/target
137- java -Djava.net.preferIPv4Stack=true -jar dubbo-demo-provider.one-jar.jar > /tmp/java2.log &
142+ java \
143+ -Djava.net.preferIPv4Stack=true \
144+ -jar dubbo-demo-provider.one-jar.jar > /tmp/java2.log &
138145
139146 - name: Build xDS library
140147 if: steps.test_env.outputs.type == 'last'
Original file line number Diff line number Diff line change 2525 fail-fast: false
2626 matrix:
2727 platform:
28- - ubuntu-20.04
28+ - ubuntu-latest
2929 os_name:
3030 - linux_openresty_tongsuo
3131 test_dir:
Original file line number Diff line number Diff line change 2525 fail-fast : false
2626 matrix :
2727 platform :
28- - ubuntu-20.04
28+ - ubuntu-latest
2929 os_name :
3030 - linux_openresty
3131 events_module :
@@ -144,15 +144,22 @@ jobs:
144144 run : |
145145 cur_dir=$(pwd)
146146 sudo apt update
147- sudo apt install -y maven
147+ sudo apt install -y maven openjdk-8-jdk
148+ sudo update-java-alternatives --set java-1.8.0-openjdk-amd64
149+ export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
150+ export PATH=$JAVA_HOME/bin:$PATH
148151 cd t/lib/dubbo-backend
149152 mvn package
150153 cd dubbo-backend-provider/target
151- java -Djava.net.preferIPv4Stack=true -jar dubbo-demo-provider.one-jar.jar > /tmp/java.log &
154+ java \
155+ -Djava.net.preferIPv4Stack=true \
156+ -jar dubbo-demo-provider.one-jar.jar > /tmp/java.log &
152157 cd $cur_dir/t/lib/dubbo-serialization-backend
153158 mvn package
154159 cd dubbo-serialization-backend-provider/target
155- java -Djava.net.preferIPv4Stack=true -jar dubbo-demo-provider.one-jar.jar > /tmp/java2.log &
160+ java \
161+ -Djava.net.preferIPv4Stack=true \
162+ -jar dubbo-demo-provider.one-jar.jar > /tmp/java2.log &
156163
157164 - name : Build xDS library
158165 if : steps.test_env.outputs.type == 'last'
Original file line number Diff line number Diff line change 2525 fail-fast : false
2626 matrix :
2727 platform :
28- - ubuntu-20.04
28+ - ubuntu-latest
2929 os_name :
3030 - linux_openresty
3131
Original file line number Diff line number Diff line change @@ -18,7 +18,7 @@ permissions:
1818jobs :
1919 test_apisix :
2020 name : run ci on redhat ubi
21- runs-on : ubuntu-20.04
21+ runs-on : ubuntu-latest
2222 timeout-minutes : 90
2323 strategy :
2424 fail-fast : false
@@ -101,11 +101,15 @@ jobs:
101101 cd t/lib/dubbo-backend
102102 mvn package
103103 cd dubbo-backend-provider/target
104- java -Djava.net.preferIPv4Stack=true -jar dubbo-demo-provider.one-jar.jar > /tmp/java.log &
104+ java \
105+ -Djava.net.preferIPv4Stack=true \
106+ -jar dubbo-demo-provider.one-jar.jar > /tmp/java.log &
105107 cd $cur_dir/t/lib/dubbo-serialization-backend
106108 mvn package
107109 cd dubbo-serialization-backend-provider/target
108- java -Djava.net.preferIPv4Stack=true -jar dubbo-demo-provider.one-jar.jar > /tmp/java2.log &
110+ java \
111+ -Djava.net.preferIPv4Stack=true \
112+ -jar dubbo-demo-provider.one-jar.jar > /tmp/java2.log &
109113
110114 - name : Build xDS library
111115 if : steps.test_env.outputs.type == 'last'
Original file line number Diff line number Diff line change 2525 fail-fast : false
2626 matrix :
2727 platform :
28- - ubuntu-20.04
28+ - ubuntu-latest
2929 os_platform :
3030 - ubuntu
3131 - redhat
Original file line number Diff line number Diff line change 2525 fail-fast : false
2626 matrix :
2727 platform :
28- - ubuntu-20.04
28+ - ubuntu-latest
2929 os_name :
3030 - linux_openresty
3131
Original file line number Diff line number Diff line change @@ -51,7 +51,7 @@ location /t {
5151GET / t
5252-- - error_code: 400
5353-- - response_body
54- {" error_msg" : " failed to check the configuration of plugin uri-blocker err: pcre2_compile () failed: missing closing parenthesis in \" .+(\" " }
54+ {" error_msg" : " failed to check the configuration of plugin uri-blocker err: pcre_compile () failed: missing ) in \" .+(\" " }
5555
5656
5757
@@ -112,7 +112,7 @@ location /t {
112112GET / t
113113-- - error_code: 400
114114-- - response_body
115- {" error_msg" : " failed to check the configuration of plugin uri-blocker err: pcre2_compile () failed: missing closing parenthesis in \" ^b(\" " }
115+ {" error_msg" : " failed to check the configuration of plugin uri-blocker err: pcre_compile () failed: missing ) in \" ^b(\" " }
116116
117117
118118
You can’t perform that action at this time.
0 commit comments