update

stanford-esrg · Feb 27, 2025 · 4a123d7 · 4a123d7
1 parent 9fc5875
commit 4a123d7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -56,6 +56,10 @@ jobs:
       if: steps.cache-dpdk.outputs.cache-hit != 'true'
       run: |
           echo "Compiling DPDK..." ;
+          export PKG_CONFIG_PATH=$(pwd)/dpdk-$DPDK_VERSION/install/lib/x86_64-linux-gnu/pkgconfig/ ;
+          export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$(pwd)/dpdk-$DPDK_VERSION/install/lib/x86_64-linux-gnu/ ;
+          export DPDK_PATH=$(pwd)/dpdk-$DPDK_VERSION/install/
+
           if [ ! -e "dpdk-$DPDK_VERSION" ] || ! pkg-config --exists libdpdk ; then
               wget http://fast.dpdk.org/rel/dpdk-$DPDK_VERSION.tar.gz &&
               tar -zxf dpdk-$DPDK_VERSION.tar.gz &&
@@ -69,10 +73,9 @@ jobs:
               cd .. ;
           fi
 
-    - name: Export enviroment variables
-      run: |
-          echo "PKG_CONFIG_PATH=$(pwd)/dpdk-$DPDK_VERSION/install/lib/x86_64-linux-gnu/pkgconfig/" >> $GITHUB_ENV
-          echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$(pwd)/dpdk-$DPDK_VERSION/install/lib/x86_64-linux-gnu/" >> $GITHUB_ENV
+          echo "PKG_CONFIG_PATH=$PKG_CONFIG_PATH" >> $GITHUB_ENV
+          echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $GITHUB_ENV
+          echo "DPDK_PATH=$DPDK_PATH" >> $GITHUB_ENV
 
     - name: Clippy retina-core (no mlx5)
       run: cargo clippy --manifest-path core/Cargo.toml --no-default-features -- --deny warnings

diff --git a/.github/workflows/rustdoc.yml b/.github/workflows/rustdoc.yml
@@ -40,13 +40,17 @@ jobs:
       id: cache-dpdk
       uses: actions/cache@v4
       with:
-        path: dpdk-20.11
-        key: ${{ runner.os }}-dpdk-20.11
+        path: dpdk-$DPDK_VERSION
+        key: ${{ runner.os }}-dpdk-$DPDK_VERSION
 
     - name: Retrive or compile DPDK
       if: steps.cache-dpdk.outputs.cache-hit != 'true'
       run: |
           echo "Compiling DPDK..." ;
+          export PKG_CONFIG_PATH=$(pwd)/dpdk-$DPDK_VERSION/install/lib/x86_64-linux-gnu/pkgconfig/ ;
+          export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$(pwd)/dpdk-$DPDK_VERSION/install/lib/x86_64-linux-gnu/ ;
+          export DPDK_PATH=$(pwd)/dpdk-$DPDK_VERSION/install/
+
           if [ ! -e "dpdk-$DPDK_VERSION" ] || ! pkg-config --exists libdpdk ; then
               wget http://fast.dpdk.org/rel/dpdk-$DPDK_VERSION.tar.gz &&
               tar -zxf dpdk-$DPDK_VERSION.tar.gz &&
@@ -60,10 +64,9 @@ jobs:
               cd .. ;
           fi
 
-    - name: Export enviroment variables
-      run: |
-          echo "PKG_CONFIG_PATH=$(pwd)/dpdk-$DPDK_VERSION/install/lib/x86_64-linux-gnu/pkgconfig/" >> $GITHUB_ENV
-          echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$(pwd)/dpdk-$DPDK_VERSION/install/lib/x86_64-linux-gnu/" >> $GITHUB_ENV
+          echo "PKG_CONFIG_PATH=$PKG_CONFIG_PATH" >> $GITHUB_ENV
+          echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $GITHUB_ENV
+          echo "DPDK_PATH=$DPDK_PATH" >> $GITHUB_ENV
 
     - name: Build Documentation (v0.1.0)
       run: git fetch --all --tags && git checkout v0.1.0 && cargo doc --lib --no-deps