diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 33040f7eb7ad..227ba7dc59be 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: fail-fast: false matrix: platform: - - ubuntu-20.04 + - ubuntu-latest os_name: - linux_openresty events_module: @@ -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' diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml index c0d769ece391..45cd0c53be5b 100644 --- a/.github/workflows/cli.yml +++ b/.github/workflows/cli.yml @@ -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 ./ci/${{ matrix.job_name }}_runner.sh script diff --git a/.github/workflows/gm-cron.yaml.disabled b/.github/workflows/gm-cron.yaml.disabled index b4c8f7e438ef..46447e41eeca 100644 --- a/.github/workflows/gm-cron.yaml.disabled +++ b/.github/workflows/gm-cron.yaml.disabled @@ -14,7 +14,7 @@ jobs: fail-fast: false matrix: platform: - - ubuntu-20.04 + - ubuntu-latest os_name: - linux_openresty_tongsuo test_dir: @@ -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' diff --git a/.github/workflows/gm.yml.disabled b/.github/workflows/gm.yml.disabled index 15bca7fa4abf..44260e0fc771 100644 --- a/.github/workflows/gm.yml.disabled +++ b/.github/workflows/gm.yml.disabled @@ -25,7 +25,7 @@ jobs: fail-fast: false matrix: platform: - - ubuntu-20.04 + - ubuntu-latest os_name: - linux_openresty_tongsuo test_dir: diff --git a/.github/workflows/http3.yml b/.github/workflows/http3.yml index 017e604f8952..50122fb49fc5 100644 --- a/.github/workflows/http3.yml +++ b/.github/workflows/http3.yml @@ -25,7 +25,7 @@ jobs: fail-fast: false matrix: platform: - - ubuntu-20.04 + - ubuntu-latest os_name: - linux_openresty events_module: @@ -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' diff --git a/.github/workflows/kubernetes-ci.yml b/.github/workflows/kubernetes-ci.yml index dc8857739b85..16f334372556 100644 --- a/.github/workflows/kubernetes-ci.yml +++ b/.github/workflows/kubernetes-ci.yml @@ -25,7 +25,7 @@ jobs: fail-fast: false matrix: platform: - - ubuntu-20.04 + - ubuntu-latest os_name: - linux_openresty diff --git a/.github/workflows/redhat-ci.yaml b/.github/workflows/redhat-ci.yaml index 29b907302af5..190919c6e4ee 100644 --- a/.github/workflows/redhat-ci.yaml +++ b/.github/workflows/redhat-ci.yaml @@ -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 @@ -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' diff --git a/.github/workflows/source-install.yml b/.github/workflows/source-install.yml index 62d192287cbc..c21435f5b114 100644 --- a/.github/workflows/source-install.yml +++ b/.github/workflows/source-install.yml @@ -25,7 +25,7 @@ jobs: fail-fast: false matrix: platform: - - ubuntu-20.04 + - ubuntu-latest os_platform: - ubuntu - redhat diff --git a/.github/workflows/tars-ci.yml b/.github/workflows/tars-ci.yml index 9e1c9fa2963e..8e2dba42e647 100644 --- a/.github/workflows/tars-ci.yml +++ b/.github/workflows/tars-ci.yml @@ -25,7 +25,7 @@ jobs: fail-fast: false matrix: platform: - - ubuntu-20.04 + - ubuntu-latest os_name: - linux_openresty diff --git a/t/plugin/uri-blocker.t b/t/plugin/uri-blocker.t index 0187fe31c6b9..616f3e84275b 100644 --- a/t/plugin/uri-blocker.t +++ b/t/plugin/uri-blocker.t @@ -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 \".+(\""} @@ -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(\""}