From a263d3017c266256615e832b61bf2015e7d571b3 Mon Sep 17 00:00:00 2001 From: Torsten Kilias Date: Fri, 25 Aug 2023 20:18:34 +0200 Subject: [PATCH] Rename generate_github_integration_tests_without_db_matrix to write_github_integration_tests_without_db_matrix and write matrix directly to the GITHUB_OUTPUT file. Remove toJSON in prepare-matrix outputs definition --- .github/workflows/integration_tests_without_db.yaml | 4 ++-- noxfile.py | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/integration_tests_without_db.yaml b/.github/workflows/integration_tests_without_db.yaml index b0598bef..73282531 100644 --- a/.github/workflows/integration_tests_without_db.yaml +++ b/.github/workflows/integration_tests_without_db.yaml @@ -19,9 +19,9 @@ jobs: - id: generate_integration_tests_without_db name: "Generate list of integration tests without DB" - run: poetry run -- nox -s generate_github_integration_tests_without_db_matrix >> "$GITHUB_OUTPUT" + run: poetry run -- nox -s write_github_integration_tests_without_db_matrix outputs: - test-path: ${{ toJSON(steps.generate_integration_tests_without_db.outputs.matrix) }} + test-path: ${{ steps.generate_integration_tests_without_db.outputs.matrix }} debug: needs: prepare_matrix diff --git a/noxfile.py b/noxfile.py index a8297062..86bd416b 100644 --- a/noxfile.py +++ b/noxfile.py @@ -1,4 +1,5 @@ import json +import os from pathlib import Path import nox @@ -54,10 +55,14 @@ def generate_github_integration_tests_without_db_matrix_json(session: Session): @nox.session(python=False) -def generate_github_integration_tests_without_db_matrix(session: Session): +def write_github_integration_tests_without_db_matrix(session: Session): json_str = _generate_github_integration_tests_without_db_matrix() - github_output_definition = f'matrix={{ "include": {json_str} }}' - print(github_output_definition) + github_output_definition = f'matrix={json_str}' + if "GITHUB_OUTPUT" in os.environ: + with open(os.environ["GITHUB_OUTPUT"], "a") as fh: + print(github_output_definition, file=fh) + else: + print(github_output_definition) @nox.session(python=False)