From cbdf690887a9ec88dcbd1deca7ad5398221597ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20De=20Keersmaeker?=
<francois.dekeersmaeker@uclouvain.be>
Date: Sat, 19 Oct 2024 17:47:34 +0200
Subject: [PATCH] CI: fix paths
---
.../add_nft_rules.sh | 0
.../install_packages.sh | 0
.../run_cppcheck.sh | 0
.../run_exec.sh | 0
.../run_tests.sh | 2 +-
.../translate_profiles.sh | 0
.../valgrind.supp | 0
.github/workflows/cross-compile.yml | 25 -----------
.github/workflows/full-test.yml | 42 -------------------
.github/workflows/publish-docs.yml | 38 -----------------
10 files changed, 1 insertion(+), 106 deletions(-)
rename .ci_scripts/{firewall-test => native-build}/add_nft_rules.sh (100%)
rename .ci_scripts/{firewall-test => native-build}/install_packages.sh (100%)
rename .ci_scripts/{firewall-test => native-build}/run_cppcheck.sh (100%)
rename .ci_scripts/{firewall-test => native-build}/run_exec.sh (100%)
rename .ci_scripts/{firewall-test => native-build}/run_tests.sh (90%)
rename .ci_scripts/{firewall-test => native-build}/translate_profiles.sh (100%)
rename .ci_scripts/{firewall-test => native-build}/valgrind.supp (100%)
delete mode 100644 .github/workflows/cross-compile.yml
delete mode 100644 .github/workflows/full-test.yml
delete mode 100644 .github/workflows/publish-docs.yml
diff --git a/.ci_scripts/firewall-test/add_nft_rules.sh b/.ci_scripts/native-build/add_nft_rules.sh
similarity index 100%
rename from .ci_scripts/firewall-test/add_nft_rules.sh
rename to .ci_scripts/native-build/add_nft_rules.sh
diff --git a/.ci_scripts/firewall-test/install_packages.sh b/.ci_scripts/native-build/install_packages.sh
similarity index 100%
rename from .ci_scripts/firewall-test/install_packages.sh
rename to .ci_scripts/native-build/install_packages.sh
diff --git a/.ci_scripts/firewall-test/run_cppcheck.sh b/.ci_scripts/native-build/run_cppcheck.sh
similarity index 100%
rename from .ci_scripts/firewall-test/run_cppcheck.sh
rename to .ci_scripts/native-build/run_cppcheck.sh
diff --git a/.ci_scripts/firewall-test/run_exec.sh b/.ci_scripts/native-build/run_exec.sh
similarity index 100%
rename from .ci_scripts/firewall-test/run_exec.sh
rename to .ci_scripts/native-build/run_exec.sh
diff --git a/.ci_scripts/firewall-test/run_tests.sh b/.ci_scripts/native-build/run_tests.sh
similarity index 90%
rename from .ci_scripts/firewall-test/run_tests.sh
rename to .ci_scripts/native-build/run_tests.sh
index 6e0c892..9eab0f2 100755
--- a/.ci_scripts/firewall-test/run_tests.sh
+++ b/.ci_scripts/native-build/run_tests.sh
@@ -1,6 +1,6 @@
EXITCODE=0
PARSERS_DIR="src/parsers"
-VALGRIND_SUPP=".ci_scripts/firewall-test/valgrind.supp"
+VALGRIND_SUPP=".ci_scripts/native-build/valgrind.supp"
PREFIX=""
for file in "$GITHUB_WORKSPACE"/bin/test/* "$PARSERS_DIR"/bin/test/*
diff --git a/.ci_scripts/firewall-test/translate_profiles.sh b/.ci_scripts/native-build/translate_profiles.sh
similarity index 100%
rename from .ci_scripts/firewall-test/translate_profiles.sh
rename to .ci_scripts/native-build/translate_profiles.sh
diff --git a/.ci_scripts/firewall-test/valgrind.supp b/.ci_scripts/native-build/valgrind.supp
similarity index 100%
rename from .ci_scripts/firewall-test/valgrind.supp
rename to .ci_scripts/native-build/valgrind.supp
diff --git a/.github/workflows/cross-compile.yml b/.github/workflows/cross-compile.yml
deleted file mode 100644
index f848aef..0000000
--- a/.github/workflows/cross-compile.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: Verify cross-compilation on OpenWrt environment
-on: [push]
-
-
-jobs:
-
- cross-compile:
- runs-on: ubuntu-latest
- container: fdekeers/openwrt_tl-wdr4900_gha
-
- steps:
-
- - name: Checkout repository
- uses: actions/checkout@v3
- with:
- submodules: recursive
-
- - name: Install Python packages
- run: pip install -r $GITHUB_WORKSPACE/requirements.txt
-
- - name: Translate profiles
- run: $GITHUB_WORKSPACE/.ci_scripts/firewall-test/translate_profiles.sh
-
- - name: Run cross-compilation
- run: $GITHUB_WORKSPACE/build.sh -d $GITHUB_WORKSPACE -t $GITHUB_WORKSPACE/openwrt/tl-wdr4900.cmake
diff --git a/.github/workflows/full-test.yml b/.github/workflows/full-test.yml
deleted file mode 100644
index b5bcb49..0000000
--- a/.github/workflows/full-test.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-name: Test the whole system
-on: [push]
-
-
-jobs:
-
- # Compile project
- build:
- runs-on: ubuntu-latest
- steps:
-
- - name: Checkout repository
- uses: actions/checkout@v3
- with:
- submodules: recursive
-
- - name: Install required packages
- run: sudo $GITHUB_WORKSPACE/.ci_scripts/firewall-test/install_packages.sh
-
- - name: Install Python packages
- run: pip install -r $GITHUB_WORKSPACE/requirements.txt
-
- - name: Translate profiles
- run: $GITHUB_WORKSPACE/.ci_scripts/firewall-test/translate_profiles.sh
-
- - name: Build project with CMake
- run: $GITHUB_WORKSPACE/build.sh -d $GITHUB_WORKSPACE
-
- - name: Run CUnit tests
- run: $GITHUB_WORKSPACE/.ci_scripts/firewall-test/run_tests.sh
-
- - name: Run Valgrind on CUnit tests
- run: $GITHUB_WORKSPACE/.ci_scripts/firewall-test/run_tests.sh valgrind
-
- - name: Run cppcheck on source files
- run: $GITHUB_WORKSPACE/.ci_scripts/firewall-test/run_cppcheck.sh
-
- - name: Add nftables rules
- run: $GITHUB_WORKSPACE/.ci_scripts/firewall-test/add_nft_rules.sh
-
- - name: Run NFQueue executables
- run: $GITHUB_WORKSPACE/.ci_scripts/firewall-test/run_exec.sh
diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml
deleted file mode 100644
index 7126e93..0000000
--- a/.github/workflows/publish-docs.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-name: Publish Doxygen to GitHub Pages
-
-on:
- push:
- branches:
- - main
-
-
-jobs:
-
- deploy:
-
- permissions:
- contents: write
-
- runs-on: ubuntu-latest
-
- steps:
- - name: Checkout repository
- uses: actions/checkout@v3
- with:
- submodules: recursive
-
- - name: Install required packages
- run: sudo $GITHUB_WORKSPACE/.ci_scripts/publish-docs/install_packages.sh
-
- - name: Generate Doxygen documentation
- run: doxygen $GITHUB_WORKSPACE/Doxyfile
-
- - name: Create .nojekyll
- run: touch docs/html/.nojekyll
-
- - name: Deploy to GitHub Pages
- uses: JamesIves/github-pages-deploy-action@3.7.1
- with:
- github_token: ${{ secrets.GITHUB_TOKEN }}
- branch: gh-pages
- folder: docs/html
--
GitLab