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..e9b0553 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,8 @@ url = https://github.com/w180112/libutil.git [submodule "lib/dpdk"] path = lib/dpdk - url = https://github.com/DPDK/dpdk + url = https://dpdk.org/git/dpdk-stable + branch = 22.11 [submodule "lib/dpdk-kmods"] path = lib/dpdk-kmods url = https://dpdk.org/git/dpdk-kmods \ No newline at end of file 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