From c7e82be29f689e57b4a2a592c59e5923fece76e0 Mon Sep 17 00:00:00 2001 From: the Date: Wed, 15 Mar 2023 01:26:02 +0800 Subject: [PATCH] [Build] replace travis ci with github action --- .github/workflows/ci.yml | 10 +++++----- .gitmodules | 9 +++++---- boot.sh | 3 +++ lib/dpdk | 2 +- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2bbcb33..36a6611 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,13 +9,13 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - run: sudo apt-get update && apt-get install -y libnuma-dev linux-headers-$(uname -r) python3-pip + - uses: actions/checkout@v2 + - run: sudo apt-get update && sudo apt-get install -y libnuma-dev linux-headers-$(uname -r) python3-pip - run: sudo pip3 install setuptools meson ninja pyelftools - - run: ./boot.sh + - run: ${{ github.workspace }}/boot.sh test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - run: sudo apt-get update && apt-get install -y libnuma-dev linux-headers-$(uname -r) python3-pip + - uses: actions/checkout@v2 + - run: sudo apt-get update && sudo apt-get install -y libnuma-dev linux-headers-$(uname -r) python3-pip - run: sudo pip3 install setuptools meson ninja pyelftools \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index 6d04b4d..8278958 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,10 @@ [submodule "lib/libutil"] path = lib/libutil url = https://github.com/w180112/libutil.git -[submodule "lib/dpdk"] - path = lib/dpdk - url = https://github.com/DPDK/dpdk [submodule "lib/dpdk-kmods"] path = lib/dpdk-kmods - url = https://dpdk.org/git/dpdk-kmods \ No newline at end of file + url = https://dpdk.org/git/dpdk-kmods +[submodule "lib/dpdk"] + path = lib/dpdk + url = https://dpdk.org/git/dpdk-stable + branch = 22.11 diff --git a/boot.sh b/boot.sh index 9637e55..aa1b298 100755 --- a/boot.sh +++ b/boot.sh @@ -11,6 +11,9 @@ get_script_dir () { echo "$DIR" } path=$(get_script_dir) +pushd $path +git submodule update --init --recursive +popd pushd $path/lib/dpdk && meson $path/lib/dpdk_build popd pushd $path/lib/dpdk_build diff --git a/lib/dpdk b/lib/dpdk index 543f40f..d75b66a 160000 --- a/lib/dpdk +++ b/lib/dpdk @@ -1 +1 @@ -Subproject commit 543f40f5952a869710e39ff51deccc96c5b88b3f +Subproject commit d75b66ad1cf8b9c0a14020a4cd9ddcd34dea924b