Merge pull request #942 from jiridanek/jd_no_chains_in_gha

RHOAIENG-19048: chore(gha): remove the upfront workflow generation script

Author: openshift-merge-bot[bot]

.github/workflows/build-notebooks-push.yaml

@@ -0,0 +1,42 @@
+---
+"name": "Build Notebooks (push)"
+"on":
+  "push":
+  "workflow_dispatch":
+  "schedule":
+    - "cron": "0 2 * * *"
+
+permissions:
+  contents: read
+  packages: write
+
+jobs:
+  gen:
+    name: Generate job matrix
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.gen.outputs.matrix }}
+      has_jobs: ${{ steps.gen.outputs.has_jobs }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Determine targets to build (we want to build everything on push)
+        run: |
+          set -x
+          python3 ci/cached-builds/gen_gha_matrix_jobs.py
+        id: gen
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        shell: bash
+
+  build:
+    needs: ["gen"]
+    strategy:
+      fail-fast: false
+      matrix: "${{ fromJson(needs.gen.outputs.matrix) }}"
+    uses: ./.github/workflows/build-notebooks-TEMPLATE.yaml
+    if: ${{ fromJson(needs.gen.outputs.has_jobs) }}
+    with:
+      target: "${{ matrix.target }}"
+      github: "${{ toJSON(github) }}"
+    secrets: inherit

.github/workflows/build-notebooks.yaml

@@ -107,7 +107,7 @@ endef
 #######################################        Build helpers                 #######################################
 
 # https://stackoverflow.com/questions/78899903/how-to-create-a-make-target-which-is-an-implicit-dependency-for-all-other-target
-skip-init-for := deploy% undeploy% test% scan-image-vulnerabilities
+skip-init-for := all-images deploy% undeploy% test% scan-image-vulnerabilities
 ifneq (,$(filter-out $(skip-init-for),$(MAKECMDGOALS) $(.DEFAULT_GOAL)))
 $(SELF): bin/buildinputs
 endif

Makefile

@@ -13,7 +13,7 @@
 import gha_pr_changed_files
 
 """Trivial Makefile parser that extracts target dependencies so that we can build each Dockerfile image target in its
-own GitHub Actions job and handle dependencies between them.
+own GitHub Actions job.
 
 The parsing is not able to handle general Makefiles, it only works with the Makefile in this project.
 Use https://pypi.org/project/py-make/ or https://github.com/JetBrains/intellij-plugins/tree/master/makefile/grammars if you look for general parser."""
@@ -57,46 +57,7 @@ def extract_image_targets(makefile_dir: str = os.getcwd()) -> list[str]:
     if len(all_images) < 1:
         raise Exception("No image dependencies found for 'all-images' Makefile target")
 
-    return all_images 
-
-def write_github_workflow_file(targets: list[str], path: pathlib.Path) -> None:
-    jobs = {}
-
-    # IDs may only contain alphanumeric characters, '_', and '-'. IDs must start with a letter or '_' and must be less than 100 characters.
-    allowed_github_chars = string.ascii_letters + string.digits + "_-"
-
-    for target in targets:
-        task_name = re.sub(r"[^-_0-9A-Za-z]", "_", target)
-        jobs[task_name] = {
-            "needs": [],
-            "uses": "./.github/workflows/build-notebooks-TEMPLATE.yaml",
-            "with": {
-                "target": target,
-                "github": "${{ toJSON(github) }}",
-            },
-            "secrets": "inherit",
-        }
-
-    workflow = {
-        "name": "Build Notebooks (push)",
-        # https://docs.github.com/en/actions/security-guides/automatic-token-authentication#modifying-the-permissions-for-the-github_token
-        "permissions": {
-            "packages": "write",
-        },
-        "on": {
-            "push": {},
-            "workflow_dispatch": {},
-            "schedule": [{ "cron": "0 2 * * *"}], # 2am UTC everyday
-        },
-        "jobs": jobs,
-    }
-
-    with open(path, "wt") as f:
-        print("---", file=f)
-        print("# This file is autogenerated by", pathlib.Path(__file__).relative_to(project_dir), file=f)
-        # every json file is a valid yaml file
-        json.dump(workflow, f, sort_keys=False, indent=4)
-        print(file=f)
+    return all_images
 
 
 def main() -> None:
@@ -112,8 +73,6 @@ def main() -> None:
 
     targets = extract_image_targets()
 
-    write_github_workflow_file(targets, project_dir / ".github" / "workflows" / "build-notebooks.yaml")
-
     if args.from_ref:
         logging.info(f"Skipping targets not modified in the PR")
         changed_files = gha_pr_changed_files.list_changed_files(args.from_ref, args.to_ref)
@@ -165,4 +124,4 @@ def test_select_changed_targets_shared_file(self):
                                 'runtime-cuda-pytorch-ubi9-python-3.11',
                                 'cuda-jupyter-tensorflow-ubi9-python-3.11',
                                 'rocm-jupyter-minimal-ubi9-python-3.11',
-                                'runtime-cuda-tensorflow-ubi9-python-3.11'}        
+                                'runtime-cuda-tensorflow-ubi9-python-3.11'}

ci/cached-builds/gen_gha_matrix_jobs.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
 set -Eeuxo pipefail
 
-python3 ci/cached-builds/gen_gha_matrix_jobs.py
 bash scripts/sync-requirements-txt.sh