From ebc759d830551360f394b74a437522a37d6cb083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=20N=C3=B8rskov=20J=C3=B8rgensen?= Date: Tue, 5 May 2026 15:58:42 +0200 Subject: [PATCH 1/2] Fix issue with Python formatting and expand scope of python-tooling --- .github/workflows/python-tooling.yml | 2 +- misc/scripts/models-as-data/generate_mad.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-tooling.yml b/.github/workflows/python-tooling.yml index bab1277dd03d..a3ad9900ea47 100644 --- a/.github/workflows/python-tooling.yml +++ b/.github/workflows/python-tooling.yml @@ -5,7 +5,7 @@ on: paths: - "misc/bazel/**" - "misc/codegen/**" - - "misc/scripts/models-as-data/bulk_generate_mad.py" + - "misc/scripts/models-as-data/*.py" - "*.bazel*" - .github/workflows/codegen.yml - .pre-commit-config.yaml diff --git a/misc/scripts/models-as-data/generate_mad.py b/misc/scripts/models-as-data/generate_mad.py index 9e6c5516b492..d78d5b10cc5d 100755 --- a/misc/scripts/models-as-data/generate_mad.py +++ b/misc/scripts/models-as-data/generate_mad.py @@ -67,7 +67,8 @@ def setenvironment(self, database=None, folder=None): self.database = database or self.database self.folder = folder or self.folder self.generated_frameworks = os.path.join( - self.codeql_root, f"{self.language}/ql/lib/ext/generated/modelgenerator/{self.folder}" + self.codeql_root, + f"{self.language}/ql/lib/ext/generated/modelgenerator/{self.folder}", ) self.workDir = tempfile.mkdtemp() if self.ram is None: From 52b02a05812f29a73772bbe7b0730ce7467ce864 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=20N=C3=B8rskov=20J=C3=B8rgensen?= Date: Wed, 6 May 2026 08:39:41 +0200 Subject: [PATCH 2/2] Fix path to generated models --- .github/workflows/mad_modelDiff.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mad_modelDiff.yml b/.github/workflows/mad_modelDiff.yml index 3b96d903e232..45a31f406664 100644 --- a/.github/workflows/mad_modelDiff.yml +++ b/.github/workflows/mad_modelDiff.yml @@ -70,7 +70,7 @@ jobs: SHORTNAME=`basename $DATABASE` python misc/scripts/models-as-data/generate_mad.py --language java --with-summaries --with-sinks $DATABASE $SHORTNAME/$QL_VARIANT mkdir -p $MODELS/$SHORTNAME - mv java/ql/lib/ext/generated/$SHORTNAME/$QL_VARIANT $MODELS/$SHORTNAME + mv java/ql/lib/ext/generated/modelgenerator/$SHORTNAME/$QL_VARIANT $MODELS/$SHORTNAME cd .. }