summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/check-open-prs-conflict.yml17
-rw-r--r--scripts/package-build/frr/package.toml6
2 files changed, 22 insertions, 1 deletions
diff --git a/.github/workflows/check-open-prs-conflict.yml b/.github/workflows/check-open-prs-conflict.yml
new file mode 100644
index 00000000..52b11938
--- /dev/null
+++ b/.github/workflows/check-open-prs-conflict.yml
@@ -0,0 +1,17 @@
+name: "Open PRs Conflicts checker"
+on:
+ push:
+ branches:
+ - current
+ - sagitta
+ - circinus
+ workflow_dispatch:
+
+permissions:
+ contents: read
+ pull-requests: write
+
+jobs:
+ check-pr-conflict-call:
+ uses: vyos/.github/.github/workflows/check-open-prs-conflict.yml@current
+ secrets: inherit
diff --git a/scripts/package-build/frr/package.toml b/scripts/package-build/frr/package.toml
index 8ff35777..002e9f50 100644
--- a/scripts/package-build/frr/package.toml
+++ b/scripts/package-build/frr/package.toml
@@ -33,5 +33,9 @@ packages = [
"python3-dev:native",
"texinfo",
"lua5.3",
- "doxygen"
+ "doxygen",
+ "bison",
+ "liblua5.3-dev",
+ "flex",
+ "libelf-dev"
]