From 86ded2a41b7ef90ca93eebaac7ad040950ede879 Mon Sep 17 00:00:00 2001 From: Huang Huang Date: Sun, 20 Oct 2024 17:26:04 +0800 Subject: [PATCH] chore(ci/arm64): Add Ubuntu 24.04 e2e test on ARM64 architecture (#169) * chore(ci/arm64): Add Ubuntu 24.04 e2e test on ARM64 architecture * fix typo * update readme --- .circleci/config.yml | 4 ++++ README.md | 2 +- README.zh-CN.md | 3 ++- testdata/test_sub_curl_domain_program.sh | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e13d9f06..2954c183 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,6 +7,9 @@ executors: ubuntu-22-04: machine: image: ubuntu-2204:2024.04.4 + ubuntu-24-04: + machine: + image: ubuntu-2404:2024.05.1 jobs: arm64-e2e: @@ -280,6 +283,7 @@ workflows: os: - ubuntu-20-04 - ubuntu-22-04 + - ubuntu-24-04 - docker-e2e - containerd-e2e - k8s-1-30-e2e diff --git a/README.md b/README.md index 6b07cbe0..cde4fab6 100644 --- a/README.md +++ b/README.md @@ -323,7 +323,7 @@ Flags: ### Dependencies -* Go >= 1.22 +* Go >= 1.23 * Clang/LLVM >= 14 * Bison >= 3.8 * Lex/Flex >= 2.6 diff --git a/README.zh-CN.md b/README.zh-CN.md index 0b13cba2..5df0fa98 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -340,12 +340,13 @@ Flags: 开发环境需要安装的系统依赖: -* Go >= 1.22 +* Go >= 1.23 * Clang/LLVM >= 14 * Bison >= 3.8 * Lex/Flex >= 2.6 * GCC * GNU make +* autoconf ### Building diff --git a/testdata/test_sub_curl_domain_program.sh b/testdata/test_sub_curl_domain_program.sh index 26559001..8f73dabd 100644 --- a/testdata/test_sub_curl_domain_program.sh +++ b/testdata/test_sub_curl_domain_program.sh @@ -15,13 +15,13 @@ function test_ptcpdump() { cat "${LNAME}" cat "${LNAME}" | grep '/usr/bin/curl' - cat "${LNAME}" | grep -F '.80: Flags [.],' + cat "${LNAME}" | grep -F '.80: Flags [S],' } function test_tcpdump_read() { which tcpdump || (apt update || true && apt install -y tcpdump) tcpdump -nr "${FNAME}" - tcpdump -nr "${FNAME}" | grep -F '.80: Flags [.],' # ACK + tcpdump -nr "${FNAME}" | grep -F '.80: Flags [S],' # SYN } function test_ptcpdump_read() {