Update submodules. (#65)

* Update submodules and runner version.

* Try a different install approach.

Author: fruffy

.github/workflows/pytest.yaml

@@ -1,19 +1,39 @@
-name: test
-on: [push]
+name: "test-debian"
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+  merge_group:
+    branches: [master]
+
+# Cancel any preceding run on the pull request.
+concurrency:
+  group: test-p4c-debian-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
 jobs:
-  test:
-    runs-on: ubuntu-18.04
+  # Build with GCC and test P4C on Ubuntu 22.04.
+  test-ubuntu22:
+    runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v1
-    - name: ccache
-      uses: hendrikmuhs/ccache-action@v1
-      with:
-        key: ${{ matrix.os }}
-        max-size: 1000M
-    - name: Install
-      run: |
-        ./do_install.sh RUN_CI=ON
-    - name: Test with CMake
-      run: |
-        cd modules/p4c/build
-        ctest -j4 -R toz3-validate --output-on-failure --schedule-random
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 0
+
+      - name: ccache
+        uses: hendrikmuhs/[email protected]
+        with:
+          key: test-${{ runner.os }}-ubuntu22
+          max-size: 1000M
+
+      - name: Install
+        run: |
+          ./do_install.sh RUN_CI=ON
+
+      - name: Test with CMake
+        run: |
+          cd modules/p4c/build
+          ctest -j4 -R toz3-validate --output-on-failure --schedule-random

do_install.sh

@@ -38,6 +38,9 @@ sudo apt install -y bison \
                     build-essential \
                     cmake \
                     git \
+                    ninja-build \
+                    clang \
+                    lld \
                     flex \
                     libboost-dev \
                     libboost-graph-dev \
@@ -113,10 +116,6 @@ sudo make install
 cd ${SRC_DIR}
 fi
 
-# If the behavioral model dependencies did not cover filesystem
-# This is needed for the validation binaries
-sudo apt install libboost-filesystem-dev
-
 # grab the toz3 extension for the p4 compiler
 mkdir -p ${MODULE_DIR}/p4c/extensions
 # only install bludgeon if we are not running in CI
@@ -131,8 +130,8 @@ echo "Building P4C..."
 cd ${MODULE_DIR}/p4c
 mkdir -p build
 cd build
-cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo
-make -j `getconf _NPROCESSORS_ONLN`
+cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=OFF -DCMAKE_LINKER=/usr/bin/lld -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DCMAKE_C_COMPILER=/usr/bin/clang  -DCMAKE_BUILD_TYPE=RelWithDebInfo -G Ninja -DCMAKE_UNITY_BUILD=ON -DENABLE_TEST_TOOLS=OFF -DENABLE_GTESTS=OFF -DENABLE_EBPF=OFF -DENABLE_UBPF=OFF -DENABLE_DPDK=OFF -DENABLE_P4TC=OFF -DENABLE_P4FMT=OFF -DENABLE_P4C_GRAPHS=OFF
+cmake --build .
 cd ../..
 
 echo "Gauntlet installation completed successfully."