diff --git a/.github/workflows/roa.yml b/.github/workflows/roa.yml index 28a1773..b1f46c9 100644 --- a/.github/workflows/roa.yml +++ b/.github/workflows/roa.yml @@ -26,6 +26,8 @@ jobs: python-version: "3.x" architecture: "x64" + - run: pip install -r .scripts/requirements.txt + - run: .scripts/generate-roa.sh - run: .scripts/push-to-roa.sh diff --git a/.github/workflows/test-your-pr.yml b/.github/workflows/test-your-pr.yml index 9160de6..f0479ef 100644 --- a/.github/workflows/test-your-pr.yml +++ b/.github/workflows/test-your-pr.yml @@ -19,6 +19,8 @@ jobs: python-version: "3.x" architecture: "x64" + - run: pip install -r .scripts/requirements.txt + - run: .scripts/generate-roa.sh - run: cat generated/README.txt diff --git a/.scripts/generate-roa.sh b/.scripts/generate-roa.sh index ab4eb6e..4b31be9 100755 --- a/.scripts/generate-roa.sh +++ b/.scripts/generate-roa.sh @@ -3,20 +3,11 @@ set -euo pipefail IFS=$'\n\t' +set -x + export MAX_LEN_4=29 export MAX_LEN_6=64 -if [ ! -d .venv ]; then - python3 -m venv .venv -fi - -source .venv/bin/activate -pip install -r .scripts/requirements.txt - -mkdir -p "generated" - -set -x - .scripts/roa.py -m "$MAX_LEN_4" -M "$MAX_LEN_6" -o generated/roa46_bird2.conf .scripts/roa.py -m "$MAX_LEN_4" -M "$MAX_LEN_6" -4 -o generated/roa4_bird2.conf .scripts/roa.py -m "$MAX_LEN_4" -M "$MAX_LEN_6" -6 -o generated/roa6_bird2.conf